Ticket #4905: patch.2

File patch.2, 2.5 KB (added by asn, 2 years ago)
Line 
1Index: projects/en/obfsproxy-instructions.wml
2===================================================================
3--- projects/en/obfsproxy-instructions.wml      (revision 25356)
4+++ projects/en/obfsproxy-instructions.wml      (working copy)
5@@ -59,22 +59,22 @@
6     <br>
7 
8     <p>
9-    Set up your Tor configuration file:<br><br>
10-    User tor<br>
11-    PIDFile /usr/local/var/run/tor/tor.pid<br>
12-    SocksPort 1999 # what port to open for local application connections<br>
13-    Log notice file /usr/local/var/log/tor/tor.log<br>
14-    DataDirectory /usr/local/var/lib/tor/data<br>
15-    UseBridges 1<br>
16-    Bridge obfs2 192.0.2.34:34545<br>
17-    ClientTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed
18+    Add the appropriate lines to your tor configuration file:
19     </p>
20 
21-    <p>Replace <em>192.0.2.34</em> with the bridge supporting obfsproxy you
22-    wish to use and <em>34545</em> with the port number the bridge uses.
23+    <p>
24+    <tt> UseBridges 1 </tt> <br>
25+    <tt> Bridge obfs2 192.0.2.34:34545 </tt> <br>
26+    <tt> ClientTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed </tt>
27     </p>
28 
29     <p>
30+    Don't forget to replace <em>192.0.2.34</em> with the IP address of
31+    the bridge you wish to use, and <em>34545</em> with the port
32+    obfpsroxy is listening on.
33+    </p>
34+
35+    <p>
36     Launch Tor using this configuration file. You can do this by using
37     your favorite init script, or by pointing the Tor binary to the
38     torrc file:
39@@ -98,17 +98,15 @@
40     <br>
41 
42     <p>
43-    Set up your Tor configuration file:<br><br>
44-    User tor<br>
45-    PIDFile /usr/local/var/run/tor/tor.pid<br>
46-    ORPort 4367<br>
47-    Log notice file /usr/local/var/log/tor/tor.log<br>
48-    DataDirectory /usr/local/var/lib/tor/data<br>
49-    BridgeRelay 1<br>
50-    ServerTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed
51+    Add the appropriate lines to your tor configuration file:
52     </p>
53 
54     <p>
55+    <tt> BridgeRelay 1 </tt> <br>
56+    <tt> ServerTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed </tt>
57+    </p>
58+
59+    <p>
60     Launch Tor using this configuration file. You can do this by using
61     your favorite init script, or by pointing the Tor binary to the
62     torrc file:
63@@ -119,7 +117,7 @@
64     </p>
65 
66     <p>
67-    Next, Find the TCP port opened by obfsproxy. Look in your log file
68+    Next, find the TCP port opened by obfsproxy. Look in your log file
69     for a line similar to this one: <br>
70     <img src="$(IMGROOT)/obfs-log_checking.png" alt="bridge torrc" width="437" height="14"></a>
71     <br>