[tor-browser-bundle/master] Relocate bridges from torrc appendices to a prefs file. - tbb-commits

28 Feb 2014

commit 3279db32f147479af225d7106949e8dddd360dbb
Author: Mike Perry mikeperry-git@torproject.org
Date:   Fri Feb 28 10:02:10 2014 -0800
Relocate bridges from torrc appendices to a prefs file.
---
 Bundle-Data/beta/bridge_prefs.js                 |   15 ++++++++
 Bundle-Data/beta/linux/torrc-defaults-appendix   |   40 +++++-----------------
 Bundle-Data/beta/mac/torrc-defaults-appendix     |   23 -------------
 Bundle-Data/beta/windows/torrc-defaults-appendix |   22 ------------
 4 files changed, 23 insertions(+), 77 deletions(-)

diff --git a/Bundle-Data/beta/bridge_prefs.js b/Bundle-Data/beta/bridge_prefs.js
new file mode 100644
index 0000000..e3d6b69
--- /dev/null
+++ b/Bundle-Data/beta/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/beta/linux/torrc-defaults-appendix b/Bundle-Data/beta/linux/torrc-defaults-appendix
index b43cd59..d0f621e 100644
--- a/Bundle-Data/beta/linux/torrc-defaults-appendix
+++ b/Bundle-Data/beta/linux/torrc-defaults-appendix
@@ -1,35 +1,11 @@
-
 ## fteproxy configuration
-# Bridge fte bridges.fteproxy.org:8080
-
 ClientTransportPlugin fte exec ./Tor/PluggableTransports/fteproxy --managed
-## obfsproxy configuration
-#
-# Bridge obfs3 83.212.101.2:42782 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D
-# Bridge obfs3 83.212.101.2:443 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D
-# Bridge obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9
-# Bridge obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9
-# Bridge obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2
-# Bridge obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F
-# Bridge obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD
-# Bridge obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E
-#
-# Bridge obfs2 83.212.100.216:47870 1F01A7BB60F49FC96E0850A6BAD6D076DFEFAF80
-# Bridge obfs2 83.212.96.182:46602 6F058CBEF888EB20D1DEB9886909F1E812245D41
-# Bridge obfs2 70.182.182.109:54542 94C9E691688FAFDEC701A0788BD15BE8AD34ED35
-# Bridge obfs2 128.31.0.34:1051 CA7434F14A898C7D3427B8295A7F83446BC7F496
-# Bridge obfs2 83.212.101.2:45235 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D
-
-ClientTransportPlugin obfs2,obfs3 exec ./Tor/PluggableTransports/obfsproxy.bin managed
-
-
-## flash proxy configuration
-#
-# # The flashproxy bridge address and port are ignored.
-# Bridge flashproxy 0.0.1.0:1
-
-# 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
+## 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
index d3e211d..e1ada73 100644
--- a/Bundle-Data/beta/mac/torrc-defaults-appendix
+++ b/Bundle-Data/beta/mac/torrc-defaults-appendix
@@ -1,34 +1,11 @@
-
 ## fteproxy configuration
-# Bridge fte bridges.fteproxy.org:8080
-
 ClientTransportPlugin fte exec PluggableTransports/fteproxy --managed
## obfsproxy configuration
-#
-# Bridge obfs3 83.212.101.2:42782 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D
-# Bridge obfs3 83.212.101.2:443 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D
-# Bridge obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9
-# Bridge obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9
-# Bridge obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2
-# Bridge obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F
-# Bridge obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD
-# Bridge obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E
-#
-# Bridge obfs2 83.212.100.216:47870 1F01A7BB60F49FC96E0850A6BAD6D076DFEFAF80
-# Bridge obfs2 83.212.96.182:46602 6F058CBEF888EB20D1DEB9886909F1E812245D41
-# Bridge obfs2 70.182.182.109:54542 94C9E691688FAFDEC701A0788BD15BE8AD34ED35
-# Bridge obfs2 128.31.0.34:1051 CA7434F14A898C7D3427B8295A7F83446BC7F496
-# Bridge obfs2 83.212.101.2:45235 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D
-
 ClientTransportPlugin obfs2,obfs3 exec PluggableTransports/obfsproxy.bin managed
-
 ## flash proxy configuration
 #
-# # The flashproxy bridge address and port are ignored.
-# Bridge flashproxy 0.0.1.0:1
-
 # 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).
diff --git a/Bundle-Data/beta/windows/torrc-defaults-appendix b/Bundle-Data/beta/windows/torrc-defaults-appendix
index 965b98a..049d2ff 100644
--- a/Bundle-Data/beta/windows/torrc-defaults-appendix
+++ b/Bundle-Data/beta/windows/torrc-defaults-appendix
@@ -1,33 +1,11 @@
 ## fteproxy configuration
-# Bridge fte bridges.fteproxy.org:8080
-
 ClientTransportPlugin fte exec Tor\PluggableTransports\fteproxy --managed
## obfsproxy configuration
-#
-# Bridge obfs3 83.212.101.2:42782 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D
-# Bridge obfs3 83.212.101.2:443 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D
-# Bridge obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9
-# Bridge obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9
-# Bridge obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2
-# Bridge obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F
-# Bridge obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD
-# Bridge obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E
-#
-# Bridge obfs2 83.212.100.216:47870 1F01A7BB60F49FC96E0850A6BAD6D076DFEFAF80
-# Bridge obfs2 83.212.96.182:46602 6F058CBEF888EB20D1DEB9886909F1E812245D41
-# Bridge obfs2 70.182.182.109:54542 94C9E691688FAFDEC701A0788BD15BE8AD34ED35
-# Bridge obfs2 128.31.0.34:1051 CA7434F14A898C7D3427B8295A7F83446BC7F496
-# Bridge obfs2 83.212.101.2:45235 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D
-
 ClientTransportPlugin obfs2,obfs3 exec Tor\PluggableTransports\obfsproxy managed
-
 ## flash proxy configuration
 #
-# # The flashproxy bridge address and port are ignored.
-# Bridge flashproxy 0.0.1.0:1
-
 # 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).

    