Browse code

Some tweaks to pt page

Sebastian Hahn authored on15/07/2016 13:31:43
Showing1 changed files
... ...
@@ -11,28 +11,42 @@
11 11
   </div>
12 12
   <div id="maincol">
13 13
     <h1>Tor: Pluggable Transports</h1>
14
-    
14
+
15 15
     <hr>
16
-    
17
-    <h3>Sometimes the Tor network is censored, and you can't connect it.</h3>
18
-    
16
+
17
+    <h3>Sometimes the Tor network is censored, and you can't connect to
18
+    it.</h3>
19
+
19 20
     <br />
20
-    
21
-    <p>An increasing number of censoring countries are using Deep Packet Inspection (DPI) to classify Internet traffic flows by protocol. While Tor uses <a href="<page docs/bridges>">bridge relays</a> to get around a censor that blocks by IP address, the censor can use DPI to recognize and filter Tor traffic flows even when they connect to unexpected IP addresses.
21
+
22
+    <p>
23
+    An increasing number of censoring countries are using Deep Packet
24
+    Inspection (DPI) to classify Internet traffic flows by protocol.
25
+    While Tor uses <a href="<page docs/bridges>">bridge relays</a> to
26
+    get around a censor that blocks by IP address, the censor can use
27
+    DPI to recognize and filter Tor traffic flows even when they connect
28
+    to unexpected IP addresses.
22 29
     </p>
23 30
 
24 31
     <h3>Pluggable Transports help you bypass censorship against Tor.</h3>
25
-    
32
+
26 33
     <br />
27
-    
28
-    <p>Pluggable Transports (PT) transform the Tor traffic flow between the client and the bridge. This way, censors who monitor traffic between the client and the bridge will see innocent-looking transformed traffic instead of the actual Tor traffic. External programs can talk to Tor clients and Tor bridges using the <a href="https://gitweb.torproject.org/torspec.git/tree/pt-spec.txt">pluggable transport API</a>, to make it easier to build interoperable programs.
34
+
35
+    <p>
36
+    Pluggable Transports (PT) transform the Tor traffic flow between the client
37
+    and the bridge. This way, censors who monitor traffic between the client
38
+    and the bridge will see innocent-looking transformed traffic instead of the
39
+    actual Tor traffic.
40
+    External programs can talk to Tor clients and Tor bridges using the <a
41
+    href="https://gitweb.torproject.org/torspec.git/tree/pt-spec.txt">pluggable
42
+    transport API</a>, to make it easier to build interoperable programs.
29 43
     </p>
30 44
 
31 45
 
32
-    <h3>Here you will learn:</h3>
33
-    
46
+    <h3>Learn more:</h3>
47
+
34 48
     <br />
35
-    
49
+
36 50
     <ul>
37 51
         <li><a href="#user">How to use a Pluggable Transport</a></li>
38 52
         <li><a href="#operator">How to become a PT bridge operator</a></li>
... ...
@@ -44,7 +58,7 @@
44 58
     <h2 id="user">How to use PTs to bypass censorship</h2>
45 59
     <p>If connections to the Tor network are being blocked by your ISP or country, follow these instructions:
46 60
     </p>
47
-    
61
+
48 62
     <a href="$(IMGROOT)/PT/2016-07-how-to-use-PT.png"> <img src="$(IMGROOT)/PT/2016-07-how-to-use-PT.png" width="830" alt="How to use PTs: 1-download tor (send email to gettor@torproject.org); 2 select configure 3; check my isp blocks tor option; 4 select obfs4; 5 press connect" /></a>
49 63
     <!-- TODO: move alt to instructions in plain text for visually impaird users -->
50 64
 
... ...
@@ -58,27 +72,39 @@
58 72
 
59 73
     <br />
60 74
 
61
-    <p>Anyone can set up a PT bridge server and help provide bandwidth to users who needs it. Once you set up a transport type, your bridge will automatically advertise support for the transport in its descriptor.</p>
75
+    <p>
76
+    Anyone can set up a PT bridge server and help provide bandwidth to users
77
+    who needs it. Once you set up a transport type, your bridge will
78
+    automatically advertise support for the transport in its descriptor.
79
+    </p>
62 80
 
63
-    <p><strong>obfs4</strong> is currently the most effective transport to bypass censorship. We are asking voluntters to run bridges for it.<br />
64
-    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>.
81
+    <p>
82
+    <strong>obfs4</strong> is currently the most effective transport to bypass
83
+    censorship. We are asking voluntters to run bridges for it.<br /> To learn
84
+    how to run this transport, please visit the <a
85
+    href="https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/obfs4proxy">obfs4proxy
86
+    wiki page</a>.
65 87
     </p>
66 88
 
67
-    <p><a href="https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports#BecomeaPTbridgeoperator">Go to our wiki</a> to learn how to set up other types of PTs.</p>
89
+    <p>
90
+    <a
91
+    href="https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports#BecomeaPTbridgeoperator">Go
92
+    to our wiki</a> to learn how to set up other types of PTs.
93
+    </p>
68 94
 
69 95
     <hr>
70 96
 
71 97
     <h2 id="developer">Become a PT developer:</h2>
72 98
 
73
-    <p> The links below are the main documentation that will help guide through what you should consider while designing your PT:</p>
99
+    <p> The links below are the main documentation for PT developers</p>
74 100
 
75 101
     <ul>
76 102
         <li><a href="https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/GuidelinesForDeployingPTs">Guidelines for deploying Pluggable Transports on Tor Browser</a></li>
77
-        <li><a href="https://gitweb.torproject.org/torspec.git/tree/pt-spec.txt">PT technical spec</a>​</li>
103
+        <li><a href="https://gitweb.torproject.org/torspec.git/tree/pt-spec.txt">PT technical spec</a></li>
78 104
         <li><a href="https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/PTEvaluationCriteria">Pluggable Transports Evaluation Criteria</a></li>
79 105
     </ul>
80 106
 
81
-    <p><a href="https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports">Our wiki</a> is also a great source of information, such as how to <a href="https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports#Waystofollowandjointheconversation:">get in touch with the community</a>, <a href="https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/ideas">ideas for new PTs</a>, how to <a href="https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/WorkListForDevsToHelpOutWith">help with PTs already deployed</a> and much more.</p>
107
+    <p><a href="https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports">Our wiki</a> is also a great source of information, such as how to <a href="https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports#Waystofollowandjointheconversation">get in touch with the community</a>, <a href="https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/ideas">ideas for new PTs</a>, how to <a href="https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/WorkListForDevsToHelpOutWith">help with PTs already deployed</a> and much more.</p>
82 108
 
83 109
     <hr>
84 110
 
... ...
@@ -102,7 +128,7 @@
102 128
 
103 129
         <li><a href="https://trac.torproject.org/projects/tor/wiki/doc/meek"><b>meek</b></a></li>
104 130
             <ul>
105
-                <li><strong>Description:</strong> Is a transport that uses HTTP for carrying bytes and TLS for obfuscation. Traffic is relayed through a third-party server (​Google App Engine). It uses a trick to talk to the third party so that it looks like it is talking to an unblocked server.</li>
131
+                <li><strong>Description:</strong> Is a transport that uses HTTP for carrying bytes and TLS for obfuscation. Traffic is relayed through a third-party server (Google App Engine). It uses a trick to talk to the third party so that it looks like it is talking to an unblocked server.</li>
106 132
                 <li><strong>Language:</strong> Go</li>
107 133
                 <li><strong>Maintainer:</strong> David Fifield</li>
108 134
                 <li><strong>Evaluation:</strong> <a href="https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/MeekEvaluation">meek Evaluation</a></li>
... ...
@@ -173,9 +199,9 @@
173 199
             <li><strong>Evaluation:</strong> none</li>            
174 200
         </ul>
175 201
     </li>
176
-    
202
+
177 203
     </ul>
178
-    
204
+
179 205
     <br /><br />
180 206
 
181 207
     <p> Also see the <emph>unofficial</emph> pluggable transports <a