Make it so when selecting moat tor actually uses those bridges, and improve tor settings dialog

This commit is contained in:
Micah Lee 2021-10-17 15:47:11 -07:00
parent 40cb55894a
commit a89412e79d
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
4 changed files with 23 additions and 5 deletions

View file

@ -333,9 +333,19 @@ class Onion(object):
for line in o:
f.write(line)
if self.settings.get("tor_bridges_use_custom_bridges"):
f.write(self.settings.get("tor_bridges_use_custom_bridges") + "\n")
f.write("\nUseBridges 1")
elif self.settings.get("tor_bridges_use_moat"):
for line in self.settings.get("tor_bridges_use_moat_bridges").split(
"\n"
):
f.write(f"Bridge {line}\n")
f.write("\nUseBridges 1\n")
elif self.settings.get("tor_bridges_use_custom_bridges"):
for line in self.settings.get(
"tor_bridges_use_custom_bridges"
).split("\n"):
f.write(f"Bridge {line}\n")
f.write("\nUseBridges 1\n")
# Execute a tor subprocess
start_ts = time.time()