diff options
author | Micah Lee <micah@micahflee.com> | 2022-03-28 19:34:18 -0700 |
---|---|---|
committer | Micah Lee <micah@micahflee.com> | 2022-03-28 19:34:18 -0700 |
commit | 2b3c7d43dabfa23f153a0c494eb6d3b6773e8bb1 (patch) | |
tree | 1a28ed78a86f0b167495266dbb71a88f6e117a39 /desktop/scripts/bridges/__init__.py | |
parent | 792ee59e9300b6e71f906c210f336109054edf07 (diff) | |
parent | ca5d1737900e885b2f9fca4122af53bdc12dafd3 (diff) | |
download | onionshare-upgrade-flask.tar.gz onionshare-upgrade-flask.zip |
Merge branch 'develop' into upgrade-flaskupgrade-flask
Diffstat (limited to 'desktop/scripts/bridges/__init__.py')
-rw-r--r-- | desktop/scripts/bridges/__init__.py | 14 |
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") |