Browse code

Fix up PT changes

Sebastian Hahn authored on14/07/2016 21:20:36
Showing5 changed files
... ...
@@ -32,7 +32,7 @@ RewriteRule ^projects/$ /projects/projects [R=301,L]
32 32
 
33 33
 #Pluggable Transports
34 34
 RewriteRule ^PT/$ /docs/pluggable-transports [R=301,L]
35
-RewriteRule ^projects/obfsproxy/$ /docs/pluggable-transports [R=410,L]
35
+RewriteRule ^projects/obfsproxy/$ /docs/pluggable-transports [R=301,L]
36 36
 RewriteRule ^projects/obfsproxy-debian-instructions/$ /docs/pluggable-transports [R=410,L]
37 37
 RewriteRule ^projects/obfsproxy-instructions/$ /docs/pluggable-transports [R=410,L]
38 38
 
... ...
@@ -34,8 +34,8 @@ transport API</a>, to make it easier to build interoperable programs.
34 34
 
35 35
     <h3>How to use PTs to bypass censorship</h3>
36 36
     <p>
37
-      If connections to Tor network are being blocked by your ISP or country,
38
-      follow this instructions:
37
+      If connections to the Tor network are being blocked by your ISP or
38
+      country, follow these instructions:
39 39
     </p>
40 40
     <a href="$(IMGROOT)/PT/2016-07-how-to-use-PT.png">
41 41
     <img src="$(IMGROOT)/PT/2016-07-how-to-use-PT.png" width="830"
... ...
@@ -46,7 +46,7 @@ transport API</a>, to make it easier to build interoperable programs.
46 46
     <h3>How to run PTs to help censored users</h3>
47 47
     <p>
48 48
       obfs4 is currently the most effective transport to bypass censorship.
49
-      To learn how to run this transport, please visit <a href="https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/obfs4proxy">obfs4proxy wiki page</a>.
49
+      To learn how to run this transport, please visit the <a href="https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/obfs4proxy">obfs4proxy wiki page</a>.
50 50
     </p>
51 51
 
52 52
     <hr>
53 53
deleted file mode 100644
... ...
@@ -1,150 +0,0 @@
1
-## translation metadata
2
-# Revision: $Revision$
3
-# Translation-Priority: 4-optional
4
-
5
-#include "head.wmi" TITLE="obfsproxy: Setting up an Obfsproxy Bridge on Debian/Ubuntu" CHARSET="UTF-8"
6
-
7
-<div id="content" class="clearfix">
8
-  <div id="breadcrumbs">
9
-    <a href="<page index>">Home &raquo; </a>
10
-    <a href="<page projects/projects>">Projects &raquo; </a>
11
-    <a href="<page projects/obfsproxy>">obfsproxy</a>
12
-  </div>
13
-  <div id="maincol">
14
-
15
-    <!-- PUT CONTENT AFTER THIS TAG -->
16
-
17
-    <h1 id="instructions">Setting up an Obfsproxy Bridge on Debian/Ubuntu</h1>
18
-
19
-    <img src="$(IMGROOT)/obfsproxy_diagram.png" alt="obfsproxy diagram"></a>
20
-
21
-    <p>
22
-    <img width="7%" height="7%" style="float: left;" src="$(IMGROOT)/icon-Obfsproxy.jpg">
23
-    <b> Hey! </b>
24
-    If you are <b>not</b> using Debian or Ubuntu, you better look
25
-    <a href="<page projects/obfsproxy-instructions>">at this other guide</a>
26
-    which sets up Obfsproxy from source.
27
-    </p>
28
-    <br><br>
29
-
30
-
31
-    <p>
32
-      This is a <b>Debian/Ubuntu</b> guide for installing the Python
33
-      version of obfsproxy. If you are still using the C version, we
34
-      recommend you to upgrade to the Python version!
35
-    </p>
36
-
37
-    <h3>Step 0: Install a recent version of Tor (>= 0.2.4.1)</h3>
38
-    <br>
39
-
40
-    <p>
41
-    Add the <a href="<page docs/debian>#ubuntu">official Tor
42
-    APT repository</a> and run the specified commands to install <code>tor</code>
43
-    and <code>deb.torproject.org-keyring</code>. You need <em>Tor 0.2.4.x</em> because
44
-    it knows how to automatically report your obfsproxy address to <a
45
-    href="https://bridges.torproject.org/?transport=obfs3">BridgeDB</a>.
46
-    </p>
47
-
48
-    <h3>Step 1: Install obfsproxy</h3>
49
-    <br>
50
-
51
-    <p>
52
-    Since you installed the Tor APT repository, installing obfsproxy is now a matter of running a command:
53
-    </p>
54
-
55
-    <pre style="margin: 1.5em 0 1.5em 2em">
56
-\# apt-get install obfsproxy
57
-    </pre>
58
-
59
-    <h3>Step 2: Configure Tor</h3>
60
-    <br>
61
-
62
-    <p>
63
-    Edit your <i>/etc/tor/torrc</i> to add:
64
-    </p>
65
-
66
-    <pre style="margin: 1.5em 0 1.5em 2em">
67
-SocksPort 0
68
-ORPort auto
69
-BridgeRelay 1
70
-Exitpolicy reject *:*
71
-
72
-\## CHANGEME_1 -> provide a nickname for your bridge, can be anything you like
73
-\#Nickname CHANGEME_1
74
-\## CHANGEME_2 -> provide some email address so we can contact you if there's a problem
75
-\#ContactInfo CHANGEME_2
76
-
77
-ServerTransportPlugin obfs3 exec /usr/bin/obfsproxy managed
78
-    </pre>
79
-
80
-    <p>
81
-    Don't forget to uncomment and edit the <i>CHANGEME</i> fields!
82
-    </p>
83
-
84
-    <h3>Step 3: Launch Tor and verify that it bootstraps</h3>
85
-    <br>
86
-
87
-    <p>
88
-    Restart Tor to use the new configuration file.
89
-    (Preface with sudo if needed.)
90
-    </p>
91
-
92
-    <pre style="margin: 1.5em 0 1.5em 2em">
93
-\# service tor restart
94
-    </pre>
95
-
96
-    <p>
97
-    Now check <i>/var/log/tor/log</i> and you should see something
98
-    like this:
99
-    </p>
100
-
101
-    <pre style="margin: 1.5em 0 1.5em 2em">
102
-Nov 05 16:40:45.000 [notice] We now have enough directory information to build circuits.
103
-Nov 05 16:40:45.000 [notice] Bootstrapped 80%: Connecting to the Tor network.
104
-Nov 05 16:40:46.000 [notice] Bootstrapped 85%: Finishing handshake with first hop.
105
-Nov 05 16:40:46.000 [notice] Bootstrapped 90%: Establishing a Tor circuit.
106
-Nov 05 16:40:48.000 [notice] Tor has successfully opened a circuit. Looks like client functionality is working.
107
-Nov 05 16:40:48.000 [notice] Bootstrapped 100%: Done.
108
-    </pre>
109
-
110
-    <p>
111
-    If Tor is earlier in the bootstrapping phase, wait until it gets to
112
-    100%.
113
-    </p>
114
-
115
-    <h3>Step 4: Set up port forwarding if needed</h3>
116
-    <br>
117
-
118
-    <p>
119
-    If you're behind a NAT/firewall, you'll need to make your bridge
120
-    reachable from the outside world &mdash; both on the ORPort and
121
-    the obfsproxy ports. The ORPort is whatever you defined in step two
122
-    above. To find your obfsproxy ports, check your Tor logs for a line
123
-    similar to this one:
124
-    </p>
125
-
126
-    <pre style="margin: 1.5em 0 1.5em 2em">
127
-Oct 05 20:00:41.000 [notice] Registered server transport 'obfs3' at '0.0.0.0:42000
128
-    </pre>
129
-
130
-    <p>
131
-    The last number in each line, in this case <i>26821</i> and
132
-    <i>42000</i>, is the TCP port number that you need to forward
133
-    through your firewall. (The ports are randomly chosen the first
134
-    time Tor starts, but Tor will cache and reuse the same number in
135
-    future runs.) If you want to change the number, use Tor
136
-    0.2.4.7-alpha or later, and set something similar to
137
-    "ServerTransportListenAddr obfs3 0.0.0.0:26821" in your torrc.
138
-    </p>
139
-
140
-  </div>
141
-  <!-- END MAINCOL -->
142
-  <div id = "sidecol">
143
-#include "side.wmi"
144
-#include "info.wmi"
145
-  </div>
146
-  <!-- END SIDECOL -->
147
-</div>
148
-<!-- END CONTENT -->
149
-#include <foot.wmi>
150
-
151 0
deleted file mode 100644
... ...
@@ -1,164 +0,0 @@
1
-## translation metadata
2
-# Revision: $Revision$
3
-# Translation-Priority: 4-optional
4
-
5
-#include "head.wmi" TITLE="obfsproxy: Installation instructions" CHARSET="UTF-8"
6
-
7
-<div id="content" class="clearfix">
8
-  <div id="breadcrumbs">
9
-    <a href="<page index>">Home &raquo; </a>
10
-    <a href="<page projects/projects>">Projects &raquo; </a>
11
-    <a href="<page projects/obfsproxy>">obfsproxy</a>
12
-  </div>
13
-  <div id="maincol">
14
-
15
-    <!-- PUT CONTENT AFTER THIS TAG -->
16
-
17
-    <h1 id="instructions">Obfsproxy Instructions</h1>
18
-
19
-    <img src="$(IMGROOT)/obfsproxy_diagram.png" alt="client torrc"></a>
20
-
21
-      <p>
22
-        This is a guide for installing the Python version of obfsproxy. If
23
-        you still have the C version, we recommend you to upgrade to the
24
-        Python version!
25
-      </p>
26
-
27
-    <h3>Step 0: Install Python</h3>
28
-    <br>
29
-
30
-    <p>
31
-      To setup obfsproxy you will need <code>Python</code> (>= 2.7),
32
-      and <code>pip</code>. If you use Debian testing (or unstable),
33
-      or a version of Ubuntu newer than Oneiric, this is easy:
34
-    <p>
35
-
36
-    <tt># apt-get install python2.7 python-pip python-dev build-essential</tt>
37
-
38
-    <p>On Fedora, that command would look like:</p>
39
-
40
-    <tt># yum install make automake gcc python-pip python-devel libyaml-devel</tt>
41
-    <br>
42
-    <br>
43
-    <h3>Step 1: Install Tor</h3>
44
-    <br>
45
-
46
-    <p>
47
-      You will also need a recent version of Tor (>= 0.2.4.1). We recommend you use
48
-      <a href="<page docs/debian>#ubuntu">Tor's repositories for Debian/Ubuntu</a>
49
-      or
50
-      <a href="https://gitweb.torproject.org/tor.git">install Tor from git</a>.
51
-    </p>
52
-
53
-    <p>
54
-    You need Tor 0.2.4.x because it knows how to automatically report
55
-    your obfsproxy address to BridgeDB.
56
-    </p>
57
-
58
-    <h3>Step 2: Install obfsproxy</h3>
59
-    <br>
60
-
61
-    <p>
62
-      If you have <code>pip</code>, installing <code>obfsproxy</code>
63
-      and its dependencies should be a matter of a single command:
64
-    </p>
65
-
66
-    <tt># pip install obfsproxy</tt><br><br>
67
-
68
-    <p>
69
-    You will probably want to run the <em>pip install</em> command as
70
-    root so that obfsproxy gets installed to /usr/local/bin.
71
-    </p>
72
-    <p>
73
-    (Instead of using pip, you could also use <a
74
-    href="https://gitweb.torproject.org/pluggable-transports/obfsproxy.git">the
75
-    git repository</a> of obfsproxy if you feel more adventurous)
76
-    </p>
77
-
78
-    <h3>Step 3: Setup tor</h3>
79
-    <br>
80
-
81
-    <p>
82
-      Now setup Tor.  Edit your /etc/tor/torrc to add:
83
-    </p>
84
-
85
-      <p>
86
-        <tt>SocksPort 0</tt><br>
87
-        <tt>ORPort auto</tt><br>
88
-        <tt>BridgeRelay 1</tt><br>
89
-        <tt>Exitpolicy reject *:*</tt><br><br>
90
-
91
-        <tt>## CHANGEME_1 -> provide a nickname for your bridge, can be anything you like</tt><br>
92
-        <tt>#Nickname CHANGEME_1</tt><br>
93
-        <tt>## CHANGEME_2 -> provide some email address so we can contact you if there's a problem</tt><br>
94
-        <tt>#ContactInfo CHANGEME_2</tt><br><br>
95
-
96
-        <tt>ServerTransportPlugin obfs3 exec /usr/local/bin/obfsproxy managed</tt><br>
97
-      </p>
98
-
99
-      <p>
100
-        Don't forget to uncomment and edit the CHANGEME fields. Also,
101
-        if you didn't install obfsproxy as root, you might have to
102
-        change its path.
103
-      </p>
104
-
105
-      <h3>Step 4: Launch Tor and verify that it bootstraps</h3>
106
-      <br>
107
-
108
-      <p>
109
-        Restart Tor to use the new configuration file. (Preface with sudo if
110
-        needed.)
111
-      </p>
112
-
113
-      <tt># service tor restart</tt><br><br>
114
-
115
-      <p>
116
-        Now check /var/log/tor/log and you should see something like this:
117
-      </p>
118
-
119
-      <tt>Nov 05 16:40:45.000 [notice] We now have enough directory information to build circuits.</tt><br>
120
-      <tt>Nov 05 16:40:45.000 [notice] Bootstrapped 80%: Connecting to the Tor network.</tt><br>
121
-      <tt>Nov 05 16:40:46.000 [notice] Bootstrapped 85%: Finishing handshake with first hop.</tt><br>
122
-      <tt>Nov 05 16:40:46.000 [notice] Bootstrapped 90%: Establishing a Tor circuit.</tt><br>
123
-      <tt>Nov 05 16:40:48.000 [notice] Tor has successfully opened a circuit. Looks like client functionality is working.</tt><br>
124
-      <tt>Nov 05 16:40:48.000 [notice] Bootstrapped 100%: Done.</tt><br><br>
125
-
126
-      <p>
127
-        If Tor is earlier in the bootstrapping phase, wait until it gets to 100%.
128
-      </p>
129
-
130
-      <h3>Step 5: Set up port forwarding if needed</h3>
131
-      <br>
132
-
133
-      <p>
134
-        If you're behind a NAT/firewall, you'll need to make your bridge
135
-        reachable from the outside world — both on the ORPort and the
136
-        obfsproxy port. The ORPort is whatever you defined in step two
137
-        above. To find your obfsproxy port, check your Tor logs for two
138
-        lines similar to these:
139
-      </p>
140
-
141
-      <tt>Oct 05 20:00:42.000 [notice] Registered server transport 'obfs3' at '0.0.0.0:40172</tt><br><br>
142
-
143
-      <p>
144
-        The last number in each line, in this case 26821 and 40172, are the
145
-        TCP port numbers that you need to forward through your
146
-        firewall. (This port is randomly chosen the first time Tor starts,
147
-        but Tor will cache and reuse the same number in future runs.) If you
148
-        want to change the number, use Tor 0.2.4.7-alpha or later, and set
149
-        "ServerTransportListenAddr obfs3 0.0.0.0:26821" in your torrc.
150
-      </p>
151
-
152
-    <br>
153
-
154
-  </div>
155
-  <!-- END MAINCOL -->
156
-  <div id = "sidecol">
157
-#include "side.wmi"
158
-#include "info.wmi"
159
-  </div>
160
-  <!-- END SIDECOL -->
161
-</div>
162
-<!-- END CONTENT -->
163
-#include <foot.wmi>
164
-
165 0
deleted file mode 100644
... ...
@@ -1,102 +0,0 @@
1
-## translation metadata
2
-# Revision: $Revision$
3
-# Translation-Priority: 4-optional
4
-
5
-#include "head.wmi" TITLE="Tor Project: obfsproxy" CHARSET="UTF-8"
6
-<div id="content" class="clearfix">
7
-  <div id="breadcrumbs">
8
-    <a href="<page index>">Home &raquo; </a>
9
-    <a href="<page projects/projects>">Projects &raquo; </a>
10
-    <a href="<page projects/obfsproxy>">obfsproxy &raquo; </a>
11
-  </div>
12
-  <div id="maincol">
13
-    <!-- PUT CONTENT AFTER THIS TAG -->
14
-
15
-    <h2>obfsproxy</h2>
16
-    <div class="underline"></div>
17
-
18
-    <!-- BEGIN SIDEBAR -->
19
-    <div class="sidebar-left">
20
-    </div>
21
-    <!-- END SIDEBAR -->
22
-
23
-    <img src="$(IMGROOT)/obfsproxy_diagram.png" alt="obfsproxy diagram"></a>
24
-    </p>
25
-
26
-    <p>
27
-    obfsproxy is a tool that attempts to circumvent censorship, by
28
-    transforming the Tor traffic between the client and the
29
-    bridge. This way, censors, who usually monitor traffic between the
30
-    client and the bridge, will see innocent-looking transformed
31
-    traffic instead of the actual Tor traffic.
32
-
33
-    <p>
34
-    obfsproxy supports multiple protocols, called <a href="<page
35
-    docs/pluggable-transports>">pluggable transports</a>, which
36
-    specify how the traffic is transformed. For example, there might
37
-    be a HTTP transport which transforms Tor traffic to look like
38
-    regular HTTP traffic. See the <a href="<page
39
-    docs/pluggable-transports>">pluggable transports page</a> for more
40
-    information.
41
-    </p>
42
-
43
-    <p>
44
-    Even though obfsproxy is a separate application, completely
45
-    independent from tor, it speaks to tor using an <a
46
-    href="https://gitweb.torproject.org/torspec.git/tree/pt-spec.txt">internal
47
-    protocol</a> to minimize necessary end-user configuration.
48
-    </p>
49
-
50
-    <p>
51
-    Please open a <a
52
-    href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_information&status=needs_review&status=needs_revision&status=new&status=reopened&component=Obfsproxy&order=priority&col=id&col=summary&col=status&col=type&col=priority&col=milestone&col=component">ticket</a>
53
-    on our bug tracker for any bugs you find or features you would
54
-    like to see added in future releases.
55
-    <br>
56
-    Also feel free to look or poke at
57
-    <a href="https://gitweb.torproject.org/pluggable-transports/obfsproxy.git">the source code</a>
58
-    and send us back any improvements you make.
59
-    </p>
60
-
61
-    <a id="morebridges"></a>
62
-    <h2><a class="anchor" href="#morebridges">Looking for obfsproxy bridges?</a></h2>
63
-    <p>
64
-    <a href="https://bridges.torproject.org/bridges?transport=obfs3">You can use BridgeDB to get obfsproxy bridges.</a>
65
-    </p>
66
-
67
-
68
-    <a id="download"></a>
69
-    <h2><a class="anchor" href="#download">Download Tor Browser with obfsproxy</a></h2>
70
-
71
-    <p>
72
-    obfsproxy is included in the
73
-<a
74
-href="<page projects/torbrowser>#downloads">official
75
-Tor Browser packages</a>.
76
-    </p>
77
-
78
-    <h2><a class="anchor" href="#instructions">Installation Instructions</a></h2>
79
-
80
-   <p>
81
-   To set up an obfsproxy bridge on a Debian/Ubuntu machine, see the separate
82
-   <a href="<page projects/obfsproxy-debian-instructions>#instructions">Obfsproxy Debian/Ubuntu Installation Instructions</a>
83
-   page.
84
-   </p>
85
-   <p>
86
-   To set up obfsproxy from source, see the separate
87
-   <a href="<page projects/obfsproxy-instructions>#instructions">Obfsproxy Installation Instructions</a>
88
-   page.
89
- </p>
90
-
91
-
92
-  </div>
93
-  <!-- END MAINCOL -->
94
-  <div id = "sidecol">
95
-#include "side.wmi"
96
-#include "info.wmi"
97
-  </div>
98
-  <!-- END SIDECOL -->
99
-</div>
100
-<!-- END CONTENT -->
101
-#include <foot.wmi>
102
-