[tbb-commits] [tor-browser-bundle/master] Switch the scramblesuit pluggable transport provider to obfs4proxy.

[gk at torproject.org]

commit 092dbbf7ee2a1a29a386f50dc1a1bec17a398f6b
Author: Yawning Angel <yawning at schwanenlied.me>
Date:   Tue Feb 17 12:42:34 2015 +0000

    Switch the scramblesuit pluggable transport provider to obfs4proxy.
---
 Bundle-Data/PTConfigs/linux/torrc-defaults-appendix   |    5 +----
 Bundle-Data/PTConfigs/mac/torrc-defaults-appendix     |    5 +----
 Bundle-Data/PTConfigs/windows/torrc-defaults-appendix |    5 +----
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix
index 50e03fd..d0885ff 100644
--- a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix
+++ b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix
@@ -1,11 +1,8 @@
 ## fteproxy configuration
 ClientTransportPlugin fte exec ./TorBrowser/Tor/PluggableTransports/fteproxy.bin --managed
 
-## obfsproxy configuration
-ClientTransportPlugin scramblesuit exec ./TorBrowser/Tor/PluggableTransports/obfsproxy.bin managed
-
 ## obfs4proxy configuration
-ClientTransportPlugin obfs2,obfs3,obfs4 exec ./TorBrowser/Tor/PluggableTransports/obfs4proxy
+ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser/Tor/PluggableTransports/obfs4proxy
 
 ## flash proxy configuration
 #
diff --git a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix
index 604098f..0dee29b 100644
--- a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix
+++ b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix
@@ -1,11 +1,8 @@
 ## fteproxy configuration
 ClientTransportPlugin fte exec PluggableTransports/fteproxy.bin --managed
 
-## obfsproxy configuration
-ClientTransportPlugin scramblesuit exec PluggableTransports/obfsproxy.bin managed
-
 ## obfs4proxy configuration
-ClientTransportPlugin obfs2,obfs3,obfs4 exec PluggableTransports/obfs4proxy
+ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec PluggableTransports/obfs4proxy
 
 ## flash proxy configuration
 #
diff --git a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix
index d92d201..f287e3e 100644
--- a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix
+++ b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix
@@ -1,11 +1,8 @@
 ## fteproxy configuration
 ClientTransportPlugin fte exec TorBrowser\Tor\PluggableTransports\fteproxy --managed
 
-## obfsproxy configuration
-ClientTransportPlugin scramblesuit exec TorBrowser\Tor\PluggableTransports\obfsproxy managed
-
 ## obfs4proxy configuration
-ClientTransportPlugin obfs2,obfs3,obfs4 exec TorBrowser\Tor\PluggableTransports\obfs4proxy
+ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\Tor\PluggableTransports\obfs4proxy
 
 ## flash proxy configuration
 #