diff options
| author | Miguel Jacq <mig@mig5.net> | 2021-12-14 14:57:01 +1100 |
|---|---|---|
| committer | Miguel Jacq <mig@mig5.net> | 2021-12-14 14:57:01 +1100 |
| commit | 12b725e821bbfc31921933ee35f70ed62846236a (patch) | |
| tree | ebd76f308684a2713b74406f0036419a357b5805 | |
| parent | 04efd3fc0ecc0844c17591cc088df3404f66670f (diff) | |
| download | onionshare-12b725e821bbfc31921933ee35f70ed62846236a.tar.gz onionshare-12b725e821bbfc31921933ee35f70ed62846236a.zip | |
Need to reconnect to Tor with the curr_settings Settings object after obtaining new bridges
| -rw-r--r-- | cli/onionshare_cli/censorship.py | 10 | ||||
| -rw-r--r-- | desktop/src/onionshare/connection_tab.py | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/cli/onionshare_cli/censorship.py b/cli/onionshare_cli/censorship.py index e8bcbcc6..22444252 100644 --- a/cli/onionshare_cli/censorship.py +++ b/cli/onionshare_cli/censorship.py @@ -230,6 +230,11 @@ class CensorshipCircumvention(object): # selected the built-in bridges for a specific PT themselves. # if bridge_source == "builtin": + self.common.log( + "CensorshipCircumvention", + "save_settings", + "Will be using built-in bridges", + ) self.settings.set("bridges_type", "built-in") if bridge_type == "obfs4": self.settings.set("bridges_builtin_pt", "obfs4") @@ -239,6 +244,11 @@ class CensorshipCircumvention(object): self.settings.set("bridges_builtin_pt", "meek-azure") bridges_ok = True else: + self.common.log( + "CensorshipCircumvention", + "save_settings", + "Will be using custom bridges", + ) # Any other type of bridge we can treat as custom. self.settings.set("bridges_type", "custom") diff --git a/desktop/src/onionshare/connection_tab.py b/desktop/src/onionshare/connection_tab.py index 16c46492..c3cf0f6d 100644 --- a/desktop/src/onionshare/connection_tab.py +++ b/desktop/src/onionshare/connection_tab.py @@ -159,7 +159,7 @@ class AutoConnectTab(QtWidgets.QWidget): ) self.active = False self.tor_con.show() - self.tor_con.start() + self.tor_con.start(self.curr_settings) def _got_no_bridges(self): self.use_bridge_widget.progress.hide() |