CircuitIdleTimeout has been removed in Tor 0.3.0.7

Author: DonnchaC

bwscanner/attacher.py

@@ -150,7 +150,7 @@ def add_single_port_exit(port):
 
 
 @defer.inlineCallbacks
-def connect_to_tor(launch_tor, circuit_build_timeout, circuit_idle_timeout, control_port=9051):
+def connect_to_tor(launch_tor, circuit_build_timeout, control_port=9051):
     """
     Launch or connect to a Tor instance
 
@@ -160,7 +160,6 @@ def connect_to_tor(launch_tor, circuit_build_timeout, circuit_idle_timeout, cont
     tor_options = {
         'LearnCircuitBuildTimeout': 0,  # Disable adaptive circuit timeouts.
         'CircuitBuildTimeout': circuit_build_timeout,
-        'CircuitIdleTimeout': circuit_idle_timeout,
         'UseEntryGuards': 0,  # Disable UseEntryGuards to avoid PathBias warnings.
         'UseMicroDescriptors': 0,
         'FetchUselessDescriptors': 1,

bwscanner/scanner.py

@@ -42,11 +42,9 @@ def __repr__(self):
               help='Launch Tor or try to connect to an existing Tor instance.')
 @click.option('--circuit-build-timeout', default=20,
               help='Option passed when launching Tor.')
-@click.option('--circuit-idle-timeout', default=20,
-              help='Option passed when launching Tor.')
 @click.version_option(BWSCAN_VERSION)
 @click.pass_context
-def cli(ctx, data_dir, loglevel, logfile, launch_tor, circuit_build_timeout, circuit_idle_timeout):
+def cli(ctx, data_dir, loglevel, logfile, launch_tor, circuit_build_timeout):
     """
     The bwscan tool measures Tor relays and calculates their bandwidth. These
     bandwidth measurements can then be aggregate to create the bandwidth
@@ -60,7 +58,7 @@ def cli(ctx, data_dir, loglevel, logfile, launch_tor, circuit_build_timeout, cir
         os.makedirs(ctx.obj.measurement_dir)
 
     # Create a connection to a Tor instance
-    ctx.obj.tor = connect_to_tor(launch_tor, circuit_build_timeout, circuit_idle_timeout)
+    ctx.obj.tor = connect_to_tor(launch_tor, circuit_build_timeout)
 
     # Set up the logger to only output log lines of level `loglevel` and above.
     setup_logging(log_level=loglevel, log_name=logfile)

test/template.py

@@ -15,7 +15,6 @@ def setUp(self):
         self.tor_state = yield connect_to_tor(
                 launch_tor=False,
                 circuit_build_timeout=30,
-                circuit_idle_timeout=30,
                 control_port=int(os.environ.get('CHUTNEY_CONTROL_PORT')))
 
         self.attacher = SOCKSClientStreamAttacher(self.tor_state)