aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2022-03-27 17:27:03 -0700
committerGitHub <noreply@github.com>2022-03-27 17:27:03 -0700
commit52cb5cf71aef4ad05d2345757f8e2a66abc86753 (patch)
treed3897ac812342b8c13b518a95fe3b9c25c1839c4
parent1608091fe352df0a85f1923847e3b64f40ec8992 (diff)
parent5cbd9ae66d957ed32d9d7ab6ce1177bf5f4bc41f (diff)
downloadonionshare-52cb5cf71aef4ad05d2345757f8e2a66abc86753.tar.gz
onionshare-52cb5cf71aef4ad05d2345757f8e2a66abc86753.zip
Merge pull request #1560 from mig5/fix_censorship_builtin_bridges_response
Remove meek workaround in Censorship Circumvention API's built-in bridges response
-rw-r--r--cli/onionshare_cli/onion.py14
1 files changed, 0 insertions, 14 deletions
diff --git a/cli/onionshare_cli/onion.py b/cli/onionshare_cli/onion.py
index 6ef4af2c..6e1dad74 100644
--- a/cli/onionshare_cli/onion.py
+++ b/cli/onionshare_cli/onion.py
@@ -954,20 +954,6 @@ class Onion(object):
"update_builtin_bridges",
f"Obtained bridges: {builtin_bridges}",
)
- if builtin_bridges["meek"]:
- # Meek bridge needs to be defined as "meek_lite", not "meek",
- # for it to work with obfs4proxy.
- # We also refer to this bridge type as 'meek-azure' in our settings.
- # So first, rename the key in the dict
- builtin_bridges["meek-azure"] = builtin_bridges.pop("meek")
- new_meek_bridges = []
- # Now replace the values. They also need the url/front params appended
- for item in builtin_bridges["meek-azure"]:
- newline = item.replace("meek", "meek_lite")
- new_meek_bridges.append(
- f"{newline} url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"
- )
- builtin_bridges["meek-azure"] = new_meek_bridges
# Save the new settings
self.settings.set("bridges_builtin", builtin_bridges)
self.settings.save()