[tbb-commits] [tor-browser-build/master] Bug 29794 - Update builtin bridges on Android

[gk at torproject.org]

commit a6fedc0228d1c66f067f5dc8454cdc110ed2777d
Author: Matthew Finkel <Matthew.Finkel at gmail.com>
Date:   Fri Mar 15 16:48:56 2019 +0000

    Bug 29794 - Update builtin bridges on Android
---
 .../0014-Bug-29794-Update-built-in-bridges.patch   | 34 ++++++++++++++++++++++
 projects/orbot/config                              |  1 +
 2 files changed, 35 insertions(+)

diff --git a/projects/orbot/0014-Bug-29794-Update-built-in-bridges.patch b/projects/orbot/0014-Bug-29794-Update-built-in-bridges.patch
new file mode 100644
index 0000000..b841723
--- /dev/null
+++ b/projects/orbot/0014-Bug-29794-Update-built-in-bridges.patch
@@ -0,0 +1,34 @@
+From 53a2ebc7fa4ce959203c94c874efc5ee6d070020 Mon Sep 17 00:00:00 2001
+From: Matthew Finkel <Matthew.Finkel at gmail.com>
+Date: Fri, 15 Mar 2019 16:47:06 +0000
+Subject: [PATCH] Bug 29794 - Update built-in bridges
+
+---
+ orbotservice/src/main/res/raw/bridges.txt | 16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/orbotservice/src/main/res/raw/bridges.txt b/orbotservice/src/main/res/raw/bridges.txt
+index 1e448ea1..61019737 100644
+--- a/orbotservice/src/main/res/raw/bridges.txt
++++ b/orbotservice/src/main/res/raw/bridges.txt
+@@ -1,7 +1,11 @@
+-obfs4 78.215.187.186:45675 AE907EE5FAA5D0D27E0C83EFA6ADF8E79FCC0FF1 cert=/TRjMo+RinKaixARMjMtZZBhystaBe+aDaapPrbiITFtWx3M/AJcvpjHjO54tJqLd1+IWQ iat-mode=0
+-obfs4 107.160.7.24:443 7A0904F6D182B81BEFE0DEDAFEC974494672627B cert=a5/IlZMnDvb8d92LTHMfsBIgL7QlDLPiXiLwe85uedC80mGD0QerygzmsWnMEdwG9ER9Eg iat-mode=0
+-obfs4 79.136.160.201:46501 66AC975BF7CB429D057AE07FC0312C57D61BAEC1 cert=dCtn9Ya8z+R8YQikdWgC3XTAt58z5Apnm95QHrJwnhFSdnphPPEz+NMm6OawWc2srKLjJg iat-mode=0
+-obfs4 94.242.249.2:58809 6AF3024788A7EA8F84E3FA3F60018B62291803E4 cert=X0sDCJLKMM/EISdGDEfGrsks41UYmScjIIXQ9AZgWFVKNKS6klcNEpdF4tNXFz6kIyk4Ug iat-mode=0
+-obfs4 35.203.134.33:2224 15524C683CC872C8C8FB5B779A8D53F54F7ADCD4 cert=bXLTv0Kwt1zgPBoeVF86vC+0tYAHepR7+QMczhhTQw9hpAIhatt/Bpe6rSGY63Zh8aZ+dQ iat-mode=0
+-obfs4 188.166.252.228:9443 595770328CA95E39FF5B81013880B46CA1B29546 cert=3PjhGUq3xWDMrBAzbV1eU4zPSB3GRGBpYdXQEs9hkrwC9RSZdnEe1P+cg7VgLgYTj/2MMg iat-mode=0
++obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9
++obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9
++obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED
++obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A
++obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1
++obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0
++obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0
++obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0
++obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0
++obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0
+ meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com
+-- 
+2.11.0
+
diff --git a/projects/orbot/config b/projects/orbot/config
index 5ad5bfc..7095537 100644
--- a/projects/orbot/config
+++ b/projects/orbot/config
@@ -46,6 +46,7 @@ input_files:
   - filename: 0011-Bug-28051-Tell-Proguard-it-should-keep-an-unused-met.patch
   - filename: 0012-Bug-28051-Escape-the-apostrophe-correctly.patch
   - filename: 0013-Bug-28051-Add-a-notification-compatibility-class.patch
+  - filename: 0014-Bug-29794-Update-built-in-bridges.patch
   - filename: set_gradle_repo_to_local.patch
   - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]'
     name: gradle-dependencies