[tor-commits] [flashproxy/master] Move the bundle torrc appendixes into separate files.
dcf at torproject.org
dcf at torproject.org
Sun Apr 7 05:01:01 UTC 2013
commit 84cc9046e7c7765f307ddb4fce87288ff40e3a61
Author: David Fifield <david at bamsoftware.com>
Date: Sat Apr 6 16:09:33 2013 -0700
Move the bundle torrc appendixes into separate files.
---
doc/bundle-gnulinux.txt | 30 +++---------------------------
doc/bundle-macosx.txt | 30 +++---------------------------
doc/bundle-torrc-gnulinux | 26 ++++++++++++++++++++++++++
doc/bundle-torrc-macosx | 26 ++++++++++++++++++++++++++
doc/bundle-torrc-windows | 26 ++++++++++++++++++++++++++
doc/bundle-windows.txt | 30 +++---------------------------
6 files changed, 87 insertions(+), 81 deletions(-)
diff --git a/doc/bundle-gnulinux.txt b/doc/bundle-gnulinux.txt
index ca1f42e..5440e2c 100644
--- a/doc/bundle-gnulinux.txt
+++ b/doc/bundle-gnulinux.txt
@@ -121,33 +121,9 @@ Copy files into the bundle.
$ cp ~/pyobfsproxy/{LICENSE,README} Docs/PyObfsproxy
$ find App -name '*.pyc' | xargs rm -f
-Make the second half of Data/Tor/torrc look like this.
-
-UseBridges 1
-# The address and port are ignored by the client transport plugin.
-Bridge websocket 0.0.1.0:1
-
-Bridge obfs2 109.163.233.198:1051
-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 169.229.59.74:32779
-Bridge obfs2 169.229.59.75:47809
-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
-
-Bridge obfs3 83.212.101.2:42782
-
-LearnCircuitBuildTimeout 0
-CircuitBuildTimeout 60
-# 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 websocket exec ./App/flashproxy-client --register :0 :9000
-ClientTransportPlugin obfs2,obfs3 exec ./App/pyobfsproxy managed
+Append bundle-torrc-gnulinux to the end of Data/Tor/torrc.
+
+ $ cat ~/flashproxy/doc/bundle-torrc-gnulinux >> Data/Tor/torrc
Re-zip the bundle. The "alpha" number should be independent of the
browser bundle's alpha.
diff --git a/doc/bundle-macosx.txt b/doc/bundle-macosx.txt
index d95bdf9..cfdca55 100644
--- a/doc/bundle-macosx.txt
+++ b/doc/bundle-macosx.txt
@@ -107,33 +107,9 @@ Copy files into the bundle.
$ cp ~/pyobfsproxy/{LICENSE,README} Contents/Resources/Docs/PyObfsproxy
$ find Contents/MacOS -name '*.pyc' | xargs rm -f
-Make the second half of Library/Vidalia/torrc look like this.
-
-UseBridges 1
-# The address and port are ignored by the client transport plugin.
-Bridge websocket 0.0.1.0:1
-
-Bridge obfs2 109.163.233.198:1051
-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 169.229.59.74:32779
-Bridge obfs2 169.229.59.75:47809
-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
-
-Bridge obfs3 83.212.101.2:42782
-
-LearnCircuitBuildTimeout 0
-CircuitBuildTimeout 60
-# 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 websocket exec flashproxy-client --register :0 :9000
-ClientTransportPlugin obfs2,obfs3 exec pyobfsproxy managed
+Append bundle-torrc-macosx to the end of Library/Vidalia/torrc.
+
+ $ cat ~/flashproxy/doc/bundle-torrc-macosx >> Library/Vidalia/torrc
Re-zip the bundle. The "alpha" number should be independent of the
browser bundle's alpha.
diff --git a/doc/bundle-torrc-gnulinux b/doc/bundle-torrc-gnulinux
new file mode 100644
index 0000000..3dc7b16
--- /dev/null
+++ b/doc/bundle-torrc-gnulinux
@@ -0,0 +1,26 @@
+
+UseBridges 1
+# The address and port are ignored by the client transport plugin.
+Bridge websocket 0.0.1.0:1
+
+Bridge obfs2 109.163.233.198:1051
+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 169.229.59.74:32779
+Bridge obfs2 169.229.59.75:47809
+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
+
+Bridge obfs3 83.212.101.2:42782
+
+LearnCircuitBuildTimeout 0
+CircuitBuildTimeout 60
+# 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 websocket exec ./App/flashproxy-client --register :0 :9000
+ClientTransportPlugin obfs2,obfs3 exec ./App/pyobfsproxy managed
diff --git a/doc/bundle-torrc-macosx b/doc/bundle-torrc-macosx
new file mode 100644
index 0000000..4624f68
--- /dev/null
+++ b/doc/bundle-torrc-macosx
@@ -0,0 +1,26 @@
+
+UseBridges 1
+# The address and port are ignored by the client transport plugin.
+Bridge websocket 0.0.1.0:1
+
+Bridge obfs2 109.163.233.198:1051
+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 169.229.59.74:32779
+Bridge obfs2 169.229.59.75:47809
+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
+
+Bridge obfs3 83.212.101.2:42782
+
+LearnCircuitBuildTimeout 0
+CircuitBuildTimeout 60
+# 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 websocket exec flashproxy-client --register :0 :9000
+ClientTransportPlugin obfs2,obfs3 exec pyobfsproxy managed
diff --git a/doc/bundle-torrc-windows b/doc/bundle-torrc-windows
new file mode 100644
index 0000000..4624f68
--- /dev/null
+++ b/doc/bundle-torrc-windows
@@ -0,0 +1,26 @@
+
+UseBridges 1
+# The address and port are ignored by the client transport plugin.
+Bridge websocket 0.0.1.0:1
+
+Bridge obfs2 109.163.233.198:1051
+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 169.229.59.74:32779
+Bridge obfs2 169.229.59.75:47809
+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
+
+Bridge obfs3 83.212.101.2:42782
+
+LearnCircuitBuildTimeout 0
+CircuitBuildTimeout 60
+# 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 websocket exec flashproxy-client --register :0 :9000
+ClientTransportPlugin obfs2,obfs3 exec pyobfsproxy managed
diff --git a/doc/bundle-windows.txt b/doc/bundle-windows.txt
index dd7477d..83115a6 100644
--- a/doc/bundle-windows.txt
+++ b/doc/bundle-windows.txt
@@ -203,33 +203,9 @@ LIBEAY32.dll and SSLEAY32.dll from being overwritten.
$ mkdir -p Docs/PyObfsproxy
$ cp ~/pyobfsproxy/{LICENSE,README} Docs/PyObfsproxy
-Make the second half of Data/Tor/torrc look like this.
-
-UseBridges 1
-# The address and port are ignored by the client transport plugin.
-Bridge websocket 0.0.1.0:1
-
-Bridge obfs2 109.163.233.198:1051
-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 169.229.59.74:32779
-Bridge obfs2 169.229.59.75:47809
-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
-
-Bridge obfs3 83.212.101.2:42782
-
-LearnCircuitBuildTimeout 0
-CircuitBuildTimeout 60
-# 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 websocket exec flashproxy-client --register :0 :9000
-ClientTransportPlugin obfs2,obfs3 exec pyobfsproxy managed
+Append bundle-torrc-windows to the end of Data/Tor/torrc.
+
+ $ cat ~/flashproxy/doc/bundle-torrc-windows >> Data/Tor/torrc
Re-zip the bundle. The "alpha" number should be independent of the
browser bundle's alpha. The 7zg program (as opposed to 7z) causes the
More information about the tor-commits
mailing list