Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-05-02 14:36:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix conflicts from snowflake merge, and fix detection of lack of meek in Moat BridgeDB request

Browse source
This commit is contained in:
Miguel Jacq 2021-10-20 15:52:29 +11:00
commit 10d1c37e08
3 changed files with 38 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cli/onionshare_cli/onion.py
View file

@ -338,14 +338,16 @@ class Onion(object):
for line in self.settings.get("tor_bridges_use_moat_bridges").split(
"\n"
):
f.write(f"Bridge {line}\n")
if line.strip() != "":
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")
if line.strip() != "":
f.write(f"Bridge {line}\n")
f.write("\nUseBridges 1\n")
# Execute a tor subprocess