Don't force connect timeout of 150 when using Bridges if a user-supplied connect timeout has been passed in already

This commit is contained in:
Miguel Jacq 2019-03-12 15:36:49 +11:00
parent 99505a4c7d
commit 9a66e331b4
No known key found for this signature in database
GPG Key ID: EEA4341C6D97A0B6

View File

@ -283,6 +283,8 @@ 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'):
# 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("")