The attached two patches remove the Google-backed meek bridge (which
hasn't worked since 2016) and moves the Azure-backed bridge to a new CDN
configuration, to match a recent change in Tor Browser.

Tor Browser ticket on removal of Google:
https://bugs.torproject.org/19715

Tor Browser ticket on change for Azure:
https://bugs.torproject.org/21342
From 54d4aa806e99ff483b74f1b0b29725f98613bf78 Mon Sep 17 00:00:00 2001
From: David Fifield <[email protected]>
Date: Fri, 17 Mar 2017 13:17:48 -0700
Subject: [PATCH 1/2] Remove to Google-based meek backend.

It was shut down in May 2016.

Corresponding Tor Browser ticket:
https://bugs.torproject.org/19715
---
 orbotservice/src/main/assets/bridges.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/orbotservice/src/main/assets/bridges.txt b/orbotservice/src/main/assets/bridges.txt
index 679f8116..dc896f64 100644
--- a/orbotservice/src/main/assets/bridges.txt
+++ b/orbotservice/src/main/assets/bridges.txt
@@ -17,6 +17,5 @@ obfs4 154.35.22.10:1984 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R8
 obfs4 154.35.22.11:1984 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0
 obfs4 154.35.22.12:1984 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0
 obfs4 154.35.22.13:1984 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0
-meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com
 meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com
 meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com
-- 
2.11.0

From 57511ac8993bbe6399d70a7f89c1d07f2ec1b4cd Mon Sep 17 00:00:00 2001
From: David Fifield <[email protected]>
Date: Fri, 17 Mar 2017 13:19:02 -0700
Subject: [PATCH 2/2] Move meek bridge to the meek.azureedge.net backend.

Corresponding Tor Browser ticket:
https://bugs.torproject.org/21342

guardian-dev thread:
https://lists.mayfirst.org/pipermail/guardian-dev/2017-January/005159.html
https://lists.mayfirst.org/pipermail/guardian-dev/2017-February/005170.html
---
 orbotservice/src/main/assets/bridges.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/orbotservice/src/main/assets/bridges.txt b/orbotservice/src/main/assets/bridges.txt
index dc896f64..642d7aa0 100644
--- a/orbotservice/src/main/assets/bridges.txt
+++ b/orbotservice/src/main/assets/bridges.txt
@@ -18,4 +18,4 @@ obfs4 154.35.22.11:1984 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqT
 obfs4 154.35.22.12:1984 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0
 obfs4 154.35.22.13:1984 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0
 meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com
-meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com
+meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com
-- 
2.11.0

Attachment: signature.asc
Description: PGP signature

_______________________________________________
List info: https://lists.mayfirst.org/mailman/listinfo/guardian-dev
To unsubscribe, email:  [email protected]

Reply via email to