[tor-commits] r25356: {website} Update obfsproxy instructions per armadev and asn's comments (in website/trunk: images projects/en)

[Sebastian Hahn]

Author: sebastian
Date: 2012-01-27 19:19:40 +0000 (Fri, 27 Jan 2012)
New Revision: 25356

Removed:
   website/trunk/images/obfs-torrc_bridge.png
   website/trunk/images/obfs-torrc_client.png
Modified:
   website/trunk/projects/en/obfsproxy-instructions.wml
Log:
Update obfsproxy instructions per armadev and asn's comments

Patch contributed by Patrick R McDonald <marlowe at antagonism.org>

Deleted: website/trunk/images/obfs-torrc_bridge.png
===================================================================
(Binary files differ)

Deleted: website/trunk/images/obfs-torrc_client.png
===================================================================
(Binary files differ)

Modified: website/trunk/projects/en/obfsproxy-instructions.wml
===================================================================
--- website/trunk/projects/en/obfsproxy-instructions.wml	2012-01-27 16:56:35 UTC (rev 25355)
+++ website/trunk/projects/en/obfsproxy-instructions.wml	2012-01-27 19:19:40 UTC (rev 25356)
@@ -28,7 +28,7 @@
 
     <p>
     In a Linux system using the APT package manager you could do: <br>
-    <tt># apt-get install autotools gcc git libevent-2.0-5 libevent-openssl-2.0-5 libssl-dev</tt>
+    <tt># apt-get install autotools-dev gcc git libevent-2.0-5 libevent-openssl-2.0-5 libssl-dev</tt>
     </p>
 
     <p>
@@ -60,9 +60,20 @@
 
     <p>
     Set up your Tor configuration file:<br><br>
-    <img src="$(IMGROOT)/obfs-torrc_client.png" alt="client torrc"></a>
+    User tor<br>
+    PIDFile /usr/local/var/run/tor/tor.pid<br>
+    SocksPort 1999 # what port to open for local application connections<br>
+    Log notice file /usr/local/var/log/tor/tor.log<br>
+    DataDirectory /usr/local/var/lib/tor/data<br>
+    UseBridges 1<br>
+    Bridge obfs2 192.0.2.34:34545<br>
+    ClientTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed
     </p>
 
+    <p>Replace <em>192.0.2.34</em> with the bridge supporting obfsproxy you
+    wish to use and <em>34545</em> with the port number the bridge uses.
+    </p>
+
     <p>
     Launch Tor using this configuration file. You can do this by using
     your favorite init script, or by pointing the Tor binary to the
@@ -88,7 +99,13 @@
 
     <p>
     Set up your Tor configuration file:<br><br>
-    <img src="$(IMGROOT)/obfs-torrc_bridge.png" alt="bridge torrc"></a>
+    User tor<br>
+    PIDFile /usr/local/var/run/tor/tor.pid<br>
+    ORPort 4367<br>
+    Log notice file /usr/local/var/log/tor/tor.log<br>
+    DataDirectory /usr/local/var/lib/tor/data<br>
+    BridgeRelay 1<br>
+    ServerTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed
     </p>
 
     <p>