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

[art at torproject.org]

commit 0ca814db9c9c87486012b20e4cdd951b6f6f85cc
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/utils/onion.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/ooni/utils/onion.py b/ooni/utils/onion.py
index 51cd044..e18a6ee 100644
--- a/ooni/utils/onion.py
+++ b/ooni/utils/onion.py
@@ -214,16 +214,11 @@ def get_client_transport(transport):
 
 
 class TorLauncherWithRetries(object):
-<<<<<<< 970cb5191f77b1da0d656e6441d77d42d53afb95
     def __init__(self, tor_config, timeout=config.tor.timeout):
-=======
-    def __init__(self, tor_config, timeout=200):
->>>>>>> Implementing bridge failover in ooniprobe
         self.retry_with = ["obfs4", "meek"]
         self.started = defer.Deferred()
         self.tor_output = StringIO.StringIO()
         self.tor_config = tor_config
-<<<<<<< 970cb5191f77b1da0d656e6441d77d42d53afb95
         if timeout is None:
             # XXX we will want to move setting the default inside of the
             # config object.
@@ -243,10 +238,6 @@ class TorLauncherWithRetries(object):
             setattr(new_tor_config, key, getattr(self.tor_config, key))
         self.tor_config = new_tor_config
 
-=======
-        self.timeout = timeout
-
->>>>>>> Implementing bridge failover in ooniprobe
     def _progress_updates(self, prog, tag, summary):
         log.msg("%d%%: %s" % (prog, summary))