From 9a66e331b40311db59f0f4fdc503841233b07d24 Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Tue, 12 Mar 2019 15:36:49 +1100 Subject: Don't force connect timeout of 150 when using Bridges if a user-supplied connect timeout has been passed in already --- onionshare/onion.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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: -- cgit v1.2.3-54-g00ecf