commit f8e7d91b4ed2e2d8f263b8b9898ce31ac28abfba Author: Mike Perry mikeperry-git@torproject.org Date: Fri Feb 28 10:04:36 2014 -0800

Rename 'beta' to PTConfigs. --- Bundle-Data/PTConfigs/bridge_prefs.js | 15 +++++++++++++++ Bundle-Data/PTConfigs/linux/torrc-defaults-appendix | 11 +++++++++++ Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 12 ++++++++++++ Bundle-Data/PTConfigs/windows/torrc-defaults-appendix | 12 ++++++++++++ Bundle-Data/beta/bridge_prefs.js | 15 --------------- Bundle-Data/beta/linux/torrc-defaults-appendix | 11 ----------- Bundle-Data/beta/mac/torrc-defaults-appendix | 12 ------------ Bundle-Data/beta/windows/torrc-defaults-appendix | 12 ------------ 8 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js new file mode 100644 index 0000000..e3d6b69 --- /dev/null +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -0,0 +1,15 @@ +# Tor Launcher preferences (default bridges): +pref("extensions.torlauncher.default_bridge_recommended_type", "obfs3"); + +// Default bridges. +pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 83.212.101.3:60475 A09D536DD1752D542E1FBB3C9CE4449D51298239"); +pref("extensions.torlauncher.default_bridge.obfs3.2", "obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); +pref("extensions.torlauncher.default_bridge.obfs3.3", "obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); +pref("extensions.torlauncher.default_bridge.obfs3.4", "obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2"); +pref("extensions.torlauncher.default_bridge.obfs3.5", "obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F"); +pref("extensions.torlauncher.default_bridge.obfs3.6", "obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD"); +pref("extensions.torlauncher.default_bridge.obfs3.7", "obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E"); + +pref("extensions.torlauncher.default_bridge.flashproxy.1", "flashproxy 0.0.1.0:1"); + +pref("extensions.torlauncher.default_bridge.fte.1", "fte bridges.fteproxy.org:8080"); diff --git a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix new file mode 100644 index 0000000..d0f621e --- /dev/null +++ b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix @@ -0,0 +1,11 @@ +## fteproxy configuration +ClientTransportPlugin fte exec ./Tor/PluggableTransports/fteproxy --managed + +## obfsproxy configuration +ClientTransportPlugin obfs2,obfs3 exec ./Tor/PluggableTransports/obfsproxy.bin managed +## flash proxy configuration +# +# Change the second number here (9000) to the number of a port that can +# receive connections from the Internet (the port for which you +# configured port forwarding). +ClientTransportPlugin flashproxy exec ./Tor/PluggableTransports/flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix new file mode 100644 index 0000000..e1ada73 --- /dev/null +++ b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix @@ -0,0 +1,12 @@ +## fteproxy configuration +ClientTransportPlugin fte exec PluggableTransports/fteproxy --managed + +## obfsproxy configuration +ClientTransportPlugin obfs2,obfs3 exec PluggableTransports/obfsproxy.bin managed + +## flash proxy configuration +# +# Change the second number here (9000) to the number of a port that can +# receive connections from the Internet (the port for which you +# configured port forwarding). +ClientTransportPlugin flashproxy exec PluggableTransports/flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix new file mode 100644 index 0000000..049d2ff --- /dev/null +++ b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix @@ -0,0 +1,12 @@ +## fteproxy configuration +ClientTransportPlugin fte exec Tor\PluggableTransports\fteproxy --managed + +## obfsproxy configuration +ClientTransportPlugin obfs2,obfs3 exec Tor\PluggableTransports\obfsproxy managed + +## flash proxy configuration +# +# Change the second number here (9000) to the number of a port that can +# receive connections from the Internet (the port for which you +# configured port forwarding). +ClientTransportPlugin flashproxy exec Tor\PluggableTransports\flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/beta/bridge_prefs.js b/Bundle-Data/beta/bridge_prefs.js deleted file mode 100644 index e3d6b69..0000000 --- a/Bundle-Data/beta/bridge_prefs.js +++ /dev/null @@ -1,15 +0,0 @@ -# Tor Launcher preferences (default bridges): -pref("extensions.torlauncher.default_bridge_recommended_type", "obfs3"); - -// Default bridges. -pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 83.212.101.3:60475 A09D536DD1752D542E1FBB3C9CE4449D51298239"); -pref("extensions.torlauncher.default_bridge.obfs3.2", "obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); -pref("extensions.torlauncher.default_bridge.obfs3.3", "obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); -pref("extensions.torlauncher.default_bridge.obfs3.4", "obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2"); -pref("extensions.torlauncher.default_bridge.obfs3.5", "obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F"); -pref("extensions.torlauncher.default_bridge.obfs3.6", "obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD"); -pref("extensions.torlauncher.default_bridge.obfs3.7", "obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E"); - -pref("extensions.torlauncher.default_bridge.flashproxy.1", "flashproxy 0.0.1.0:1"); - -pref("extensions.torlauncher.default_bridge.fte.1", "fte bridges.fteproxy.org:8080"); diff --git a/Bundle-Data/beta/linux/torrc-defaults-appendix b/Bundle-Data/beta/linux/torrc-defaults-appendix deleted file mode 100644 index d0f621e..0000000 --- a/Bundle-Data/beta/linux/torrc-defaults-appendix +++ /dev/null @@ -1,11 +0,0 @@ -## fteproxy configuration -ClientTransportPlugin fte exec ./Tor/PluggableTransports/fteproxy --managed - -## obfsproxy configuration -ClientTransportPlugin obfs2,obfs3 exec ./Tor/PluggableTransports/obfsproxy.bin managed -## flash proxy configuration -# -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec ./Tor/PluggableTransports/flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/beta/mac/torrc-defaults-appendix b/Bundle-Data/beta/mac/torrc-defaults-appendix deleted file mode 100644 index e1ada73..0000000 --- a/Bundle-Data/beta/mac/torrc-defaults-appendix +++ /dev/null @@ -1,12 +0,0 @@ -## fteproxy configuration -ClientTransportPlugin fte exec PluggableTransports/fteproxy --managed - -## obfsproxy configuration -ClientTransportPlugin obfs2,obfs3 exec PluggableTransports/obfsproxy.bin managed - -## flash proxy configuration -# -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec PluggableTransports/flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/beta/windows/torrc-defaults-appendix b/Bundle-Data/beta/windows/torrc-defaults-appendix deleted file mode 100644 index 049d2ff..0000000 --- a/Bundle-Data/beta/windows/torrc-defaults-appendix +++ /dev/null @@ -1,12 +0,0 @@ -## fteproxy configuration -ClientTransportPlugin fte exec Tor\PluggableTransports\fteproxy --managed - -## obfsproxy configuration -ClientTransportPlugin obfs2,obfs3 exec Tor\PluggableTransports\obfsproxy managed - -## flash proxy configuration -# -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec Tor\PluggableTransports\flashproxy-client --register :0 :9000