[tor-commits] [tor-browser-bundle/master] Add pt configuration to torrcs.

[mikeperry@xxxxxxxxxxxxxx]

commit a00c11ea9ecc81937ddc1c616f7b7481037bbfb7
Author: David Fifield <david@xxxxxxxxxxxxxxx>
Date:   Thu Nov 7 06:21:30 2013 +0000

    Add pt configuration to torrcs.
    
    Bridges are commented out. With #5018, we could leave in
    ClientTransportPlugin lines, and tor would not start them until there is
    a Bridge line that needs them. #5018 is only merged into 0.2.5 at this
    point.
    
    https://trac.torproject.org/projects/tor/ticket/5018
    
    Even more forward-looking, we might need another way to take care of
    transports that discover their own bridges, and want to run even without
    bridges configured.
    
    https://trac.torproject.org/projects/tor/ticket/5018#comment:17
---
 Bundle-Data/linux/Data/Tor/torrc-defaults   |   33 +++++++++++++++++++++++++++
 Bundle-Data/mac/Data/Tor/torrc-defaults     |   33 +++++++++++++++++++++++++++
 Bundle-Data/windows/Data/Tor/torrc-defaults |   33 +++++++++++++++++++++++++++
 3 files changed, 99 insertions(+)

diff --git a/Bundle-Data/linux/Data/Tor/torrc-defaults b/Bundle-Data/linux/Data/Tor/torrc-defaults
index 819b9e8..2fbfb04 100644
--- a/Bundle-Data/linux/Data/Tor/torrc-defaults
+++ b/Bundle-Data/linux/Data/Tor/torrc-defaults
@@ -8,3 +8,36 @@ Log notice stdout
 SocksPort 9150
 ControlPort 9151
 CookieAuthentication 1
+
+
+## obfsproxy configuration
+#
+# Bridge obfs3 83.212.101.2:42782
+# Bridge obfs3 83.212.101.2:443
+# Bridge obfs3 169.229.59.75:46328
+# Bridge obfs3 169.229.59.74:31493
+#
+# Bridge obfs2 83.212.100.216:47870
+# Bridge obfs2 83.212.96.182:46602
+# Bridge obfs2 109.105.109.163:46924
+# Bridge obfs2 70.182.182.109:54542
+# Bridge obfs2 209.141.36.236:60783
+# Bridge obfs2 208.79.90.242:55564
+# Bridge obfs2 128.31.0.34:1051
+# Bridge obfs2 83.212.101.2:45235
+
+ClientTransportPlugin obfs2,obfs3 exec ./Tor/PluggableTransports/obfsproxy.bin managed
+
+
+## flash proxy configuration
+#
+# LearnCircuitBuildTimeout 0
+# CircuitBuildTimeout 60
+#
+# # 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
diff --git a/Bundle-Data/mac/Data/Tor/torrc-defaults b/Bundle-Data/mac/Data/Tor/torrc-defaults
index 819b9e8..ee928aa 100644
--- a/Bundle-Data/mac/Data/Tor/torrc-defaults
+++ b/Bundle-Data/mac/Data/Tor/torrc-defaults
@@ -8,3 +8,36 @@ Log notice stdout
 SocksPort 9150
 ControlPort 9151
 CookieAuthentication 1
+
+
+## obfsproxy configuration
+#
+# Bridge obfs3 83.212.101.2:42782
+# Bridge obfs3 83.212.101.2:443
+# Bridge obfs3 169.229.59.75:46328
+# Bridge obfs3 169.229.59.74:31493
+#
+# Bridge obfs2 83.212.100.216:47870
+# Bridge obfs2 83.212.96.182:46602
+# Bridge obfs2 109.105.109.163:46924
+# Bridge obfs2 70.182.182.109:54542
+# Bridge obfs2 209.141.36.236:60783
+# Bridge obfs2 208.79.90.242:55564
+# Bridge obfs2 128.31.0.34:1051
+# Bridge obfs2 83.212.101.2:45235
+
+ClientTransportPlugin obfs2,obfs3 exec PluggableTransports/obfsproxy.bin managed
+
+
+## flash proxy configuration
+#
+# LearnCircuitBuildTimeout 0
+# CircuitBuildTimeout 60
+#
+# # 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 PluggableTransports/flashproxy-client --register :0 :9000
diff --git a/Bundle-Data/windows/Data/Tor/torrc-defaults b/Bundle-Data/windows/Data/Tor/torrc-defaults
index 819b9e8..4830a1e 100644
--- a/Bundle-Data/windows/Data/Tor/torrc-defaults
+++ b/Bundle-Data/windows/Data/Tor/torrc-defaults
@@ -8,3 +8,36 @@ Log notice stdout
 SocksPort 9150
 ControlPort 9151
 CookieAuthentication 1
+
+
+## obfsproxy configuration
+#
+# Bridge obfs3 83.212.101.2:42782
+# Bridge obfs3 83.212.101.2:443
+# Bridge obfs3 169.229.59.75:46328
+# Bridge obfs3 169.229.59.74:31493
+#
+# Bridge obfs2 83.212.100.216:47870
+# Bridge obfs2 83.212.96.182:46602
+# Bridge obfs2 109.105.109.163:46924
+# Bridge obfs2 70.182.182.109:54542
+# Bridge obfs2 209.141.36.236:60783
+# Bridge obfs2 208.79.90.242:55564
+# Bridge obfs2 128.31.0.34:1051
+# Bridge obfs2 83.212.101.2:45235
+
+ClientTransportPlugin obfs2,obfs3 exec Tor\PluggableTransports\obfsproxy managed
+
+
+## flash proxy configuration
+#
+# LearnCircuitBuildTimeout 0
+# CircuitBuildTimeout 60
+#
+# # 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



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits