[tor-commits] [ooni-probe/master] Implementing bridge failover in ooniprobe

[art at torproject.org]

commit 90ec4fb643841b4a2c97fa2985e66d7138049467
Author: Arturo Filastò <arturo at filasto.net>
Date:   Tue Jun 14 16:15:44 2016 +0300

    Implementing bridge failover in ooniprobe
    
    We support failing over to obfs4 and meek when vanilla tor does not work.
    
    * This implements #538
---
 ooni/oonicli.py     | 6 +++---
 ooni/utils/onion.py | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ooni/oonicli.py b/ooni/oonicli.py
index 2eb1d9f..23c0b85 100644
--- a/ooni/oonicli.py
+++ b/ooni/oonicli.py
@@ -44,9 +44,9 @@ class Options(usage.Options):
         ["collector", "c", None, "Specify the address of the collector for "
                                  "test results. In most cases a user will "
                                  "prefer to specify a bouncer over this."],
-        ["bouncer", "b", None, "Specify the bouncer used to "
-                               "obtain the address of the "
-                               "collector and test helpers."],
+        ["bouncer", "b", CANONICAL_BOUNCER_ONION, "Specify the bouncer used to "
+                                            "obtain the address of the "
+                                            "collector and test helpers."],
         ["logfile", "l", None, "Write to this logs to this filename."],
         ["pcapfile", "O", None, "Write a PCAP of the ooniprobe session to "
                                 "this filename."],
diff --git a/ooni/utils/onion.py b/ooni/utils/onion.py
index e18a6ee..cd13640 100644
--- a/ooni/utils/onion.py
+++ b/ooni/utils/onion.py
@@ -237,6 +237,7 @@ class TorLauncherWithRetries(object):
                 continue
             setattr(new_tor_config, key, getattr(self.tor_config, key))
         self.tor_config = new_tor_config
+        self.timeout = timeout
 
     def _progress_updates(self, prog, tag, summary):
         log.msg("%d%%: %s" % (prog, summary))