aboutsummaryrefslogtreecommitdiff
path: root/desktop/scripts/bridges/__init__.py
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2022-03-27 12:44:41 -0700
committerMicah Lee <micah@micahflee.com>2022-03-27 12:44:41 -0700
commit06e9b3d3fc876a1e62500b0bbf443c401c34705d (patch)
treeffec9d7405e116d5d863937d8f32057d38257c87 /desktop/scripts/bridges/__init__.py
parent1608091fe352df0a85f1923847e3b64f40ec8992 (diff)
downloadonionshare-06e9b3d3fc876a1e62500b0bbf443c401c34705d.tar.gz
onionshare-06e9b3d3fc876a1e62500b0bbf443c401c34705d.zip
Fix built-in bridge detection, and update built-in bridges. Also update README after setting up Windows dev environment
Diffstat (limited to 'desktop/scripts/bridges/__init__.py')
-rw-r--r--desktop/scripts/bridges/__init__.py14
1 files changed, 3 insertions, 11 deletions
diff --git a/desktop/scripts/bridges/__init__.py b/desktop/scripts/bridges/__init__.py
index e2495e38..f9d3c9a9 100644
--- a/desktop/scripts/bridges/__init__.py
+++ b/desktop/scripts/bridges/__init__.py
@@ -52,9 +52,9 @@ class UpdateTorBridges:
)
return False
- for bridge_type in ["meek", "obfs4", "snowflake"]:
+ for bridge_type in ["meek-azure", "obfs4", "snowflake"]:
if result[bridge_type]:
- if bridge_type == "meek":
+ if bridge_type == "meek-azure":
torrc_template_extension = "meek_lite_azure"
else:
torrc_template_extension = bridge_type
@@ -71,12 +71,4 @@ class UpdateTorBridges:
# random order from the API each time, and create noisy git diff.
bridges.sort(key=lambda s: s.split()[1])
for item in bridges:
- if bridge_type == "meek":
- # obfs4proxy expects the bridge type to be meek_lite, and the url/front params
- # are missing in the Tor API response, so we have to add them in ourselves.
- bridge = item.replace("meek", "meek_lite")
- f.write(
- f"Bridge {bridge} url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com\n"
- )
- else:
- f.write(f"Bridge {item}\n")
+ f.write(f"Bridge {item}\n")