commit 3135c79f586cc635fe6c8ab88b800ec9065dff90 Author: Georg Koppen <gk@torproject.org> Date: Tue Jul 22 19:04:32 2014 +0000 Bug 12381, 12673: Squashed + merged kpdyer/master. This hopefully fixes fte over proxy support (12381) and adds new fte bridges (12673). --- Bundle-Data/PTConfigs/bridge_prefs.js | 22 +++++++++++++++++----- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 5a1532e..6ee714d 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -16,11 +16,23 @@ pref("extensions.torlauncher.default_bridge.flashproxy.3", "flashproxy 0.0.1.0:3 pref("extensions.torlauncher.default_bridge.flashproxy.4", "flashproxy 0.0.1.0:4"); pref("extensions.torlauncher.default_bridge.flashproxy.5", "flashproxy 0.0.1.0:5"); -pref("extensions.torlauncher.default_bridge.fte.1", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); -pref("extensions.torlauncher.default_bridge.fte.2", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); -pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); -pref("extensions.torlauncher.default_bridge.fte.4", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); -pref("extensions.torlauncher.default_bridge.fte.5", "fte 79.125.3.12:8080 272465348803EE2546A9BB8EE37D462915531F09"); +// <ipv4> +pref("extensions.torlauncher.default_bridge.fte.1", "fte t5fPOQM3-1097909862.us-west-2.elb.amazonaws.com:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); +pref("extensions.torlauncher.default_bridge.fte.2", "fte 54.244.94.118:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); +pref("extensions.torlauncher.default_bridge.fte.3", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); +pref("extensions.torlauncher.default_bridge.fte.4", "fte server-01.fteproxy.net:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); +pref("extensions.torlauncher.default_bridge.fte.5", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); +pref("extensions.torlauncher.default_bridge.fte.6", "fte server-02.fteproxy.net:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); +pref("extensions.torlauncher.default_bridge.fte.7", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); +pref("extensions.torlauncher.default_bridge.fte.8", "fte server-03.fteproxy.net:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); +pref("extensions.torlauncher.default_bridge.fte.9", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); +pref("extensions.torlauncher.default_bridge.fte.10", "fte server-04.fteproxy.net:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); +pref("extensions.torlauncher.default_bridge.fte.11", "fte 79.125.3.12:8080 272465348803EE2546A9BB8EE37D462915531F09"); +pref("extensions.torlauncher.default_bridge.fte.12", "fte server-05.fteproxy.net:8080 272465348803EE2546A9BB8EE37D462915531F09"); +// </ipv4> +// <ipv6> +pref("extensions.torlauncher.default_bridge.fte.13", "fte ipv6.t5fPOQM3-1097909862.us-west-2.elb.amazonaws.com:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); +// </ipv6> pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 188.40.121.112:39707 5DE8D363D8F150C99E1A2D7237368D614838132C password=L5POGQONBPS2HZUR6GXBIDS4CMIYYOTI"); pref("extensions.torlauncher.default_bridge.scramblesuit.2", "scramblesuit 188.226.213.208:54278 AA5A86C1490296EF4FACA946CC5A182FCD1C5B1E password=MD2VRP7WXAMSG7MKIGMHI4CB4BMSNO7T"); diff --git a/gitian/versions b/gitian/versions index 0372cf7..b51c2af 100755 --- a/gitian/versions +++ b/gitian/versions @@ -19,7 +19,7 @@ PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.9 FLASHPROXY_TAG=1.6 LIBFTE_TAG=ee9e9ddf5c86e6940559a313d2bd22cc33b654c9 # tag 0.0.3 -FTEPROXY_TAG=5e7a9fd498a948d17b0996275ef1b6f743251317 # tag 0.2.15 +FTEPROXY_TAG=b1b863534b25a6c95b0a5eac76f8cb8be6266f88 # tag 0.2.17 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 6be86bd..e8957a0 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -19,7 +19,7 @@ PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.9 FLASHPROXY_TAG=1.6 LIBFTE_TAG=ee9e9ddf5c86e6940559a313d2bd22cc33b654c9 # tag 0.0.3 -FTEPROXY_TAG=5e7a9fd498a948d17b0996275ef1b6f743251317 # tag 0.2.15 +FTEPROXY_TAG=b1b863534b25a6c95b0a5eac76f8cb8be6266f88 # tag 0.2.17 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 diff --git a/gitian/versions.beta b/gitian/versions.beta index aedcf44..2e2754a 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -19,7 +19,7 @@ PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.9 FLASHPROXY_TAG=1.6 LIBFTE_TAG=19f6b8ffafca2ec8fffbc418bc0f88518cea22ac # tag 0.0.2 -FTEPROXY_TAG=b5d7fba5c505907693fd2b5321f2aa57d4390cfa # tag 0.2.14 +FTEPROXY_TAG=b1b863534b25a6c95b0a5eac76f8cb8be6266f88 # tag 0.2.17 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2