diff options
| author | Miguel Jacq <mig@mig5.net> | 2019-03-12 15:36:49 +1100 |
|---|---|---|
| committer | Miguel Jacq <mig@mig5.net> | 2019-03-12 15:36:49 +1100 |
| commit | 9a66e331b40311db59f0f4fdc503841233b07d24 (patch) | |
| tree | 40173281350172998f492af72e6cac74182a2e9b | |
| parent | 99505a4c7df690ccd0f6262595b4ea4d61125207 (diff) | |
| download | onionshare-9a66e331b40311db59f0f4fdc503841233b07d24.tar.gz onionshare-9a66e331b40311db59f0f4fdc503841233b07d24.zip | |
Don't force connect timeout of 150 when using Bridges if a user-supplied connect timeout has been passed in already
| -rw-r--r-- | onionshare/onion.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/onionshare/onion.py b/onionshare/onion.py index 03d1a1b0..5cb11e27 100644 --- a/onionshare/onion.py +++ b/onionshare/onion.py @@ -283,7 +283,9 @@ class Onion(object): if self.settings.get('tor_bridges_use_custom_bridges') or \ self.settings.get('tor_bridges_use_obfs4') or \ self.settings.get('tor_bridges_use_meek_lite_azure'): - connect_timeout = 150 + # Only override timeout if a custom timeout has not been passed in + if connect_timeout == 120: + connect_timeout = 150 if time.time() - start_ts > connect_timeout: print("") try: |