commit fc74ecfeeb9c94c502a1fb7f17f672bc3fd7d4e3
Author: Mike Perry <[email protected]>
Date: Thu May 29 11:48:11 2014 -0700
Revert "Remove scamblesuit bridges for now."
This reverts commit 429309ce162a0e1c36c9d3ed9c5bd89ca4879fd8.
The alphas will have scramblesuit.
---
Bundle-Data/PTConfigs/bridge_prefs.js | 6 +++---
Bundle-Data/PTConfigs/linux/torrc-defaults-appendix | 2 +-
Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 2 +-
Bundle-Data/PTConfigs/windows/torrc-defaults-appendix | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js
b/Bundle-Data/PTConfigs/bridge_prefs.js
index 6d8ac38..8d2afed 100644
--- a/Bundle-Data/PTConfigs/bridge_prefs.js
+++ b/Bundle-Data/PTConfigs/bridge_prefs.js
@@ -22,6 +22,6 @@ pref("extensions.torlauncher.default_bridge.fte.3", "fte
128.105.214.163:8080 A1
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");
-//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");
-//pref("extensions.torlauncher.default_bridge.scramblesuit.3", "scramblesuit
83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239
password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH");
+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");
+pref("extensions.torlauncher.default_bridge.scramblesuit.3", "scramblesuit
83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239
password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH");
diff --git a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix
b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix
index 87108bd..8327587 100644
--- a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix
+++ b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix
@@ -2,7 +2,7 @@
ClientTransportPlugin fte exec ./Tor/PluggableTransports/fteproxy.bin --managed
## obfsproxy configuration
-ClientTransportPlugin obfs2,obfs3 exec ./Tor/PluggableTransports/obfsproxy.bin
managed
+ClientTransportPlugin obfs2,obfs3,scramblesuit exec
./Tor/PluggableTransports/obfsproxy.bin managed
## flash proxy configuration
#
# Change the second number here (9000) to the number of a port that can
diff --git a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix
b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix
index 7c6e6a5..19fc8e0 100644
--- a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix
+++ b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix
@@ -2,7 +2,7 @@
ClientTransportPlugin fte exec PluggableTransports/fteproxy.bin --managed
## obfsproxy configuration
-ClientTransportPlugin obfs2,obfs3 exec PluggableTransports/obfsproxy.bin
managed
+ClientTransportPlugin obfs2,obfs3,scramblesuit exec
PluggableTransports/obfsproxy.bin managed
## flash proxy configuration
#
diff --git a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix
b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix
index 049d2ff..bc1399d 100644
--- a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix
+++ b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix
@@ -2,7 +2,7 @@
ClientTransportPlugin fte exec Tor\PluggableTransports\fteproxy --managed
## obfsproxy configuration
-ClientTransportPlugin obfs2,obfs3 exec Tor\PluggableTransports\obfsproxy
managed
+ClientTransportPlugin obfs2,obfs3,scramblesuit exec
Tor\PluggableTransports\obfsproxy managed
## flash proxy configuration
#
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
