[tor-commits] [flashproxy/master] Copy obfs2 and obfs3 bridges into the bundle instructions.

[dcf at torproject.org]

commit 6140eb0dae38184c1624da9404ed7f85c3a8697a
Author: David Fifield <david at bamsoftware.com>
Date:   Wed Mar 6 10:42:57 2013 -0800

    Copy obfs2 and obfs3 bridges into the bundle instructions.
---
 doc/bundle-gnulinux.txt |   14 ++++++++++++--
 doc/bundle-macosx.txt   |   14 ++++++++++++--
 doc/bundle-windows.txt  |   14 ++++++++++++--
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/doc/bundle-gnulinux.txt b/doc/bundle-gnulinux.txt
index 183ff0f..9458ca4 100644
--- a/doc/bundle-gnulinux.txt
+++ b/doc/bundle-gnulinux.txt
@@ -126,8 +126,18 @@ UseBridges 1
 # The address and port are ignored by the client transport plugin.
 Bridge websocket 0.0.1.0:1
 
-# Keep the obfs2 bridges.
-...
+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 obfs3 83.212.101.2:42782
 
 LearnCircuitBuildTimeout 0
 CircuitBuildTimeout 60
diff --git a/doc/bundle-macosx.txt b/doc/bundle-macosx.txt
index 4ce8a3c..c08557d 100644
--- a/doc/bundle-macosx.txt
+++ b/doc/bundle-macosx.txt
@@ -102,8 +102,18 @@ UseBridges 1
 # The address and port are ignored by the client transport plugin.
 Bridge websocket 0.0.1.0:1
 
-# Keep the obfs2 bridges.
-...
+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 obfs3 83.212.101.2:42782
 
 LearnCircuitBuildTimeout 0
 CircuitBuildTimeout 60
diff --git a/doc/bundle-windows.txt b/doc/bundle-windows.txt
index 7c373e2..233b1f8 100644
--- a/doc/bundle-windows.txt
+++ b/doc/bundle-windows.txt
@@ -108,8 +108,18 @@ UseBridges 1
 # The address and port are ignored by the client transport plugin.
 Bridge websocket 0.0.1.0:1
 
-# Keep the list of obfs2 bridges
-...
+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 obfs3 83.212.101.2:42782
 
 LearnCircuitBuildTimeout 0
 CircuitBuildTimeout 60