Browse code

Make the bridge user documentation usable again

Matthew Finkel authored on 14/01/2015 18:23:49
Showing 14 changed files
... ...
@@ -14,7 +14,7 @@
14 14
     <a href="<page docs/documentation>">Documentation &raquo; </a>
15 15
     <a href="<page docs/bridges>">Bridges</a>
16 16
   </div>
17
-  <div id="maincol"> 
17
+  <div id="maincol">
18 18
     <a id="BridgeIntroduction"></a>
19 19
     <h2><a class="anchor" href="#BridgeIntroduction">Tor: Bridges</a></h2>
20 20
     <hr>
... ...
@@ -22,106 +22,106 @@
22 22
     <p>
23 23
     <img width="7%" height="7%" style="float: left;" src="$(IMGROOT)/icon-Obfsproxy.jpg">
24 24
     <b>Tip:</b>
25
-    Having trouble connecting to Tor even when using bridges? You will
26
-    need to use <b>pluggable transports</b> and <b>obfuscated
27
-    bridges</b>. <a class="anchor" href="#PluggableTransports">Click
28
-    here for more information</a>.
25
+    Having trouble connecting to Tor? You may need to use a different <b>pluggable
26
+    transport</b>. <a class="anchor" href="#PluggableTransports">Click here for
27
+    more information</a>.
29 28
     </p>
30
-    
29
+
31 30
     <p>
32 31
     Bridge relays (or "bridges" for short) are Tor relays that aren't listed in
33 32
     the main Tor directory. Since there is no complete public list of them, even if
34 33
     your ISP is filtering connections to all the known Tor relays, they probably
35 34
     won't be able to block all the bridges. If you suspect your access to the
36
-    Tor network is being blocked, you may want to use the bridge feature of Tor.
35
+    Tor network is being blocked, you may want to use bridges.
37 36
     </p>
38
-    
37
+
39 38
     <p>
40 39
     The addition of bridges to Tor is a step forward in the blocking
41 40
     resistance race. It is perfectly possible that even if your ISP filters
42 41
     the Internet, you do not require a bridge to use Tor. So you should try
43 42
     to use Tor without bridges first, since it might work.
44 43
     </p>
45
-    
44
+
46 45
     <p>
47 46
     Note that it's also possible that Tor is non-functional for other
48
-    reasons. The latest version of <a href="<page projects/torbrowser>">The
49
-    Tor Browser Bundle</a> on Windows tries to give you better hints about
50
-    why Tor is having problems connecting. You should also read <a
51
-    href="<wikifaq>#IinstalledTorandPolipobutitsnotworking.">the
47
+    reasons. The latest version of <a href="<page projects/torbrowser>">
48
+    Tor Browser</a> tries to give you better hints about why Tor is having
49
+    problems connecting. You should also read <a href="<page docs/faq>#DoesntWork">the
52 50
     FAQ about problems with running Tor properly</a> when you have issues.
53
-    If you feel that the issue is clearly blocking, or you'd simply like to try
54
-    because you're unsure or feeling adventurous, please read on. Ensure
55
-    that you're using the <a href="<page download/download>#Dev">latest 0.2.3.x or
56
-    0.2.4.x bundle for your platform</a>.
51
+    If you feel that the issue is clearly related to Tor being blocked, or
52
+    you'd simply like to try because you're unsure or feeling adventurous,
53
+    please read on. Ensure that you're using the <a href="<page download/download>#Dev">latest
54
+    Tor Browser for your platform</a>.
57 55
     </p>
58
-    
56
+
59 57
     <p>
60
-    To use a bridge, you'll need to locate one. Furthermore, you'll need to
61
-    configure Tor with whatever bridge address you intend to use. You'll do this
62
-    with Vidalia, the Tor controller.
63
-    If your Internet connection requires the use of a proxy, you'll probably
64
-    need to configure Vidalia to do so first. If you don't think you need
65
-    to configure a proxy for your Internet connection, you probably don't.
66
-    Give it a try and if you have issues, ask us for help.
58
+    To use a bridge, you have two options. Tor Browser now provides some
59
+    bridges by default. You can enable these easily. Unfortunately, because
60
+    these bridges are publically distributed, it is easy for censors to block
61
+    some of them, so some of them may not work. In this case, you'll need to
62
+    locate different bridges. Furthermore, you'll need to configure Tor Browser
63
+    with whichever bridge address you intend to use. If your Internet connection
64
+    requires the use of a proxy, you'll probably need to configure Tor Browser
65
+    to use it first. If you don't think you need to configure a proxy for your
66
+    Internet connection, you probably don't. Give it a try and if you have
67
+    issues, <a href="<page about/contact>#support">ask us for help</a>.
67 68
     </p>
68
-    
69
-    <p>Freedom House has produced a video on how to get and use Tor bridges.
70
-    If you don't see a video below, view it at <a
71
-    href="http://www.youtube.com/thetorproject">Youtube:
72
-    Freedom4Internet</a> Know of a better video, or one translated into
73
-    your language?  Let us know!</p>
74
-    
75
-    <div class="center">
76
-    <p><video id="v1" src="https://media.torproject.org/video/2009-using-a-bridge-relay-to-access-tor.ogv" autobuffer="true" controls="controls"></video></p>
77
-    </div>
78
-    
69
+
79 70
     <p>
80
-    At the moment, you can get a bridge by visiting
81
-    <a href="https://bridges.torproject.org/">https://bridges.torproject.org/</a>
82
-    with your web browser. If this page is filtered for you, and you
83
-    don't have any other proxies or ways to reach it, there are <a
84
-    href="#FindingMore">other ways to find bridges</a> too.
71
+    <ul>
72
+    <li><a href="#PluggableTransports">Obfuscated Bridges and Pluggable Transports</a></li>
73
+    <li><a href="#Understanding">Understanding Bridge Configuration Lines</a></li>
74
+    <li><a href="#AddTorNotWorks">Adding bridges in Tor Browser when Tor doesn't work</a></li>
75
+    <li><a href="#AddTorWorks">Adding bridges in Tor Browser when Tor does work</a></li>
76
+    <li><a href="#FindingMore">Finding more bridges for Tor</a></li>
77
+    </ul>
85 78
     </p>
86
-    
79
+
87 80
     <a id="PluggableTransports"></a>
88
-    <h2><a class="anchor" href="#PluggableTransports">Obfuscated Bridges and Pluggable Transports</a></h2>
81
+    <h2><a class="anchor" href="#PluggableTransports">Pluggable Transports</a></h2>
89 82
     <hr>
90
-    
91
-    <p> Lately, censors have found ways to block Tor even when clients
92
-    are using bridges. They usually do this by installing boxes in
93
-    ISPs that peek at network traffic and detect Tor; when Tor is
94
-    detected they block the traffic flow.
83
+
84
+    <p>Over the last few years, censors have found ways to block Tor even when
85
+    clients are using bridges. They usually do this by installing special
86
+    boxes at ISPs that peek into network traffic and detect Tor; when Tor
87
+    is detected they block the traffic flow.
95 88
     </p>
96 89
 
97 90
     <p>To circumvent such sophisticated censorship Tor introduced
98
-    <i>obfuscated bridges</i>. These bridges use special plugins
99
-    called <i>pluggable transports</i> which obfuscate the traffic
100
-    flow of Tor, making its detection harder.
91
+    <a href="<page docs/pluggable-transports>"><i>pluggable transports</i></a>.
92
+    These transports manipulate all Tor traffic between the client and its
93
+    first hop such that it is not identifiable as a Tor connection. If the
94
+    censor can't decide if the connection is a Tor connection, then they are
95
+    less likely to block it.</p>
101 96
 
102
-    To connect to obfuscated bridges you need to use the <a
103
-    href="<page projects/obfsproxy>#download">Obfsproxy
104
-    Tor Browser Bundle</a>. The bundle includes some pre-configured
105
-    obfsproxy bridges and you can get more from <a
106
-    href=https://bridges.torproject.org/?transport=obfs2>BridgeDB</a>
97
+    <p>Sadly, pluggable transports are not immune to detection, if a censor
98
+    is given enough time. In the past, we promoted obfs and obfs2 as safe
99
+    transports. These are now deprecated and were replaced by obfs3,
100
+    scramblesuit, fte, and obfs4.</p>
101
+
102
+    <p>Bridges which support pluggable transports can be used with Tor Browser
103
+    easily. Tor Browser includes some pre-configured bridges and you can get
104
+    more from <a href="#FindingMore">BridgeDB</a>, if those don't work.</p>
107 105
 
108 106
     <a id="Understanding"></a>
109
-    <h2><a class="anchor" href="#Understanding">Understanding bridges</a></h2><hr>
107
+    <h2><a class="anchor" href="#Understanding">Understanding A Bridge Configuration Line</a></h2>
108
+    <hr>
110 109
     <p>
111
-    As an example, you'll get a bridge entry that looks like the
112
-    following:
110
+    As an example, when you obtain a bridge from https://bridges.torproject.org,
111
+    you'll get a bridge entry that looks like the following:
113 112
     </p>
114 113
     <pre><samp>
115
-    bridge 141.201.27.48:443 4352e58420e68f5e40bf7c74faddccd9d1349413
114
+    141.201.27.48:443 4352e58420e68f5e40bf7c74faddccd9d1349413
116 115
     </samp>
117 116
     </pre>
118
-    
117
+
119 118
     <p>
120 119
     Understanding the components of a bridge line isn't strictly required
121 120
     but may prove useful. You can skip this section if you'd like.<br>
122
-    The first element is the IP address: <tt>'141.201.27.48'</tt><br>
123
-    The second element is the port: <tt>'443'</tt><br>
124
-    The third element, the fingerprint, is optional:
121
+    The first element is the IP address of the bridge: <tt>'141.201.27.48'</tt><br>
122
+    The second element is the port number: <tt>'443'</tt><br>
123
+    The third element, the fingerprint (unique identifier of the
124
+    bridge), is optional:
125 125
     <tt>'4352e58420e68f5e40bf7c74faddccd9d1349413'</tt><br>
126 126
 
127 127
     <p>
... ...
@@ -131,82 +131,188 @@
131 131
     <p>
132 132
     If your bridge line looks like this:
133 133
     <pre><samp>
134
-    bridge obfs2 141.201.27.48:420 4352e58420e68f5e40bf7c74faddccd9d1349413
134
+    obfs3 141.201.27.48:420 4352e58420e68f5e40bf7c74faddccd9d1349413
135 135
     </samp>
136 136
     </pre>
137 137
 
138
-    The second element is the name of the pluggable transport
138
+    The first element is the name of the pluggable transport
139 139
     technology used by the bridge. For example, in the case above, the
140
-    bridge is using the <i>obfs2</i> pluggable transport.
140
+    bridge is using the <i>obfs3</i> pluggable transport.
141 141
     </p>
142 142
 
143 143
     <a id="UsingBridges"></a>
144
-    <h2><a class="anchor" href="#UsingBridges">Using bridges with Tor and
145
-    Vidalia</a></h2>
144
+    <h2><a class="anchor" href="#UsingBridges">Using bridges with Tor
145
+    Browser</a></h2>
146 146
     <hr>
147
-    
148
-    <p>
149
-    To use the example bridge address above, go to Vidalia's Network settings
150
-    page, and click "My ISP blocks connections to the Tor network".  Add each
151
-    bridge address one at a time in the Vidalia Network settings page,
152
-    by pasting it into the "Add a Bridge" window and then clicking the "+"
153
-    sign. Adding a bridge is pictured below:
154
-    </p>
155
-    
147
+
148
+    <ul>
149
+    <li><a href="#AddTorNotWorks">Adding bridges in Tor Browser when Tor doesn't work</a></li>
150
+    <li><a href="#AddTorWorks">Adding bridges in Tor Browser when Tor does work</a></li>
151
+    </ul>
152
+
153
+    <a id="AddTorNotWorks"></a>
154
+    <h3><a href="#AddTorNotWorks">Adding bridges in Tor Browser when Tor <em>does not</em> work:</a></h3>
155
+    <hr>
156
+
157
+    <p>First, you should read <a href="<page docs/faq>#DoesntWork">the
158
+    FAQ about problems with running Tor properly</a> when you have issues.
159
+    Sometimes Tor does not work due to a silly mistake rather than your
160
+    ISP interfering with your Internet connection.</p>
161
+
156 162
     <br><br>
157
-    <img src="$(IMGROOT)/vidalia-bridges.png" alt="Vidalia's Network settings page">
163
+    <h3>1) To add a bridge, follow the instructions on screen. Click the
164
+        "Configure" button.
165
+    </h3>
166
+    <br/>
167
+    <img src="$(IMGROOT)/tb-tor-launcher-startup.png" alt="Tor Browser's Initial Configuration page">
168
+    <br><br><br>
169
+    <h3>2) If you must configure a proxy then select "Yes" and enter the
170
+        details on the following page.
171
+        <br/>If you do not use a proxy then select "No" and click "Next".
172
+        <br/>If you do not know if you must configure a proxy then you likely
173
+        do not need to do it.
174
+    </h3>
175
+    <br/>
176
+    <img src="$(IMGROOT)/tb-tor-launcher-no-proxy.png" alt="Tor Browser's Proxy page">
177
+    <br><br><br>
178
+    <h3>3) After you configure a proxy or skip over that configuration page,
179
+        the following page asks "Does your Internet Service Provider (ISP)
180
+        block or otherwise censor connections to the Tor Network?". Select
181
+        "Yes" and then click "Next".</h3>
182
+    <br/>
183
+    <img src="$(IMGROOT)/tb-tor-launcher-isp-interference.png" alt="Tor Browser's Bridge page">
184
+    <br><br><br>
185
+    <h3>4) Now you have two configuration options. You can use bridges which are
186
+        preconfigured and provided with Tor Browser, or you can specify your
187
+        own bridge(s).</h3>
188
+    <br/>
189
+    <img src="$(IMGROOT)/tb-tor-launcher-bridges-options.png" alt="Tor Browser's Bridge Configuration page">
190
+    <br><br><br>
191
+    <h3>5a) If you want to use one of the provided bridges, then choose the
192
+    transport type you want to use. obfs3 is currently the recommend
193
+    type, but depending on where you are located another type may work better
194
+    for you. If you have any questions, please <a href="<page about/contact>#support">contact
195
+    us.</a></h3>
196
+    <br/>
197
+    <img src="$(IMGROOT)/tb-tor-launcher-bridges-provided.png" alt="Tor Browser's Bridge Configuration page - provided bridges">
198
+    <br><br><br>
199
+    <h3>5b) Alternatively, if you want to use a <a href="#FindingMore">custom
200
+    bridge</a>, then select "Enter custom bridges" and copy-and-paste the
201
+    bridge information into the textbox.
202
+    </h3>
203
+    <br/>
204
+    <img src="$(IMGROOT)/tb-tor-launcher-bridges-custom.png" alt="Tor Browser's Bridge Configuration page - provided bridges">
205
+    <br><br><br>
206
+    <h3>6) After you decide which bridges you want to use, click "Connect".
207
+    Tor should now be able to load successfully and the browser window
208
+    should appear.</h3>
209
+    <br/>
210
+    <img src="$(IMGROOT)/tb-frontpage.png" alt="Tor Browser's Front Page">
211
+    <br><br><br><br>
212
+
213
+    <a id="AddTorWorks"></a>
214
+    <h3><a href="#AddTorWorks">Adding bridges in Tor Browser when Tor <em>does</em> work:</a></h3>
215
+    <hr>
216
+
217
+    <p>The following instructions assume Tor Browser successfully loads and
218
+    you are able to surf the web. If you do not see the web browser when you
219
+    run Tor Browser (like in step (1) below), you may need to follow the
220
+    <a href="#AddTorNotWorks">instructions above</a>.
221
+
158 222
     <br><br>
159
-    
160
-    <p>
161
-    You'll want to add as many bridge addresses as you know about, since
162
-    additional bridges will increase reliability. One bridge should be enough
163
-    to reach the Tor network, but if you only have one bridge and it goes
164
-    down, you will be cut off from the Tor network.
165
-    </p>
223
+    <h3>1) Start Tor Browser:</h3>
224
+    <br>
225
+    <img src="$(IMGROOT)/tb-frontpage.png" alt="Tor Browser's Front Page">
226
+    <br><br><br>
227
+    <h3>2) To begin using bridges, open Tor Browser's Network Settings:</h3>
228
+    <br>
229
+    <img src="$(IMGROOT)/tb-tor-button-menu.png" alt="Tor Browser's TorButton Menu">
230
+    <br><br><br>
231
+    <h3>3) Select "My Internet Service Provider (ISP) blocks connections to the Tor network":</h3>
232
+    <br>
233
+    <img src="$(IMGROOT)/tb-bridge-networksettings.png" alt="Tor Browser's Network Settings page">
234
+    <br><br><br>
235
+    <h3>4) Now you have two configuration options. You can use bridges which are
236
+        preconfigured and provided with Tor Browser, or you can specify your
237
+        own bridge(s).</h3>
238
+    <br>
239
+    <img src="$(IMGROOT)/tb-bridges-options-from-browser.png" alt="Tor Browser's TorButton Menu">
240
+    <br><br><br>
241
+    <h3>5a) If you want to use one of the provided bridges, then choose the
242
+    transport type you want to use. obfs3 is currently the recommend
243
+    type, but depending on where you are located another type may work better
244
+    for you. If you have any questions, please <a href="<page about/contact>#support">contact
245
+    us.</a></h3>
246
+    <br>
247
+    <img src="$(IMGROOT)/tb-bridges-provided-from-browser.png" alt="My Internet Service Provider (ISP) blocks connections to the Tor network">
248
+    <br><br><br>
249
+    <h3>5b) Alternatively, if you want to use a <a href="#FindingMore">custom
250
+    bridge</a>, then select "Enter custom bridges" and copy-and-paste the
251
+    bridge information into the textbox.
252
+    </h3>
253
+    <br>
254
+    <img src="$(IMGROOT)/tb-bridges-custom-from-browser.png" alt="Add bridges in the custom bridges textbox">
255
+    <br><br><br>
166 256
 
167 257
     <p>
168
-    <img width="7%" height="7%" style="vertical-align:middle" src="$(IMGROOT)/icon-Obfsproxy.jpg">
169
-         <span><b>Pluggable transports tip:</b></span>
258
+    Tor will only use one bridge at a time, but it is good to add more than one
259
+    bridge so you can continue using Tor even if your first bridge becomes
260
+    unavailable.
170 261
     </p>
171
-    <p>
262
+    <br><br>
172 263
 
173
-    If you have managed to get hold of some obfuscated bridge
174
-    addresses, you should add them in Vidalia in the same fashion that
175
-    you add normal bridges. Just paste the bridge line into the "Add a
176
-    bridge" window:
177 264
 
178
-    <br><br>
179
-    <img src="$(IMGROOT)/vidalia_add_obfsbridge.png" alt="Add obfuscated bridge in Vidalia">
180
-    <br><br>
181
-    
182 265
     <a id="FindingMore"></a>
183 266
     <h2><a class="anchor" href="#FindingMore">Finding more bridges for Tor</a></h2>
184 267
     <hr>
185
-    
268
+
186 269
     <p>
187
-    Another way to find public bridge addresses is to send mail to
188
-    bridges@bridges.torproject.org with the line "get bridges" by itself in the
189
-    body of the mail. You'll need to send this request from a gmail
190
-    account, though &mdash; otherwise we make it too easy for an attacker
191
-    to make a lot of email addresses and learn about all the bridges.
192
-    Almost instantly, you'll receive a reply that includes:
270
+    If you need to get bridges, you can get a bridge by visiting
271
+    <a href="https://bridges.torproject.org/">https://bridges.torproject.org/</a>
272
+    with your web browser.
273
+    </p>
274
+
275
+    <p>
276
+    You can also get bridges by sending mail to bridges@bridges.torproject.org
277
+    with the line "get bridges" by itself in the body of the mail. You'll need
278
+    to send this request from a Gmail, Riseup!, or Yahoo! account, though
279
+    &mdash; we only accept these providers because otherwise we make it too
280
+    easy for an attacker to make a lot of email addresses and learn about all
281
+    the bridges.  Almost instantly, you'll receive a reply that includes:
193 282
     </p>
194 283
     <pre>
195
-    Here are your bridge relays:
284
+    Here are your bridge:
285
+
286
+     60.16.182.53:9001
287
+     87.237.118.139:444
288
+     60.63.97.221:443
196 289
 
197
-     bridge 60.16.182.53:9001
198
-     bridge 87.237.118.139:444
199
-     bridge 60.63.97.221:443
290
+    </pre>
291
+    <p>
292
+    Similarly, if you need bridges with a specific pluggable transport, the
293
+    process is just as easy. First, decide which type you want. Currently we
294
+    provide obfs2, obfs3, scramblesuit, and fte. If you don't know which one
295
+    you should choose, then obfs3 is usually a good choice. Send an email to
296
+    bridges@bridges.torproject.org with "get transport obfs3" by itself in
297
+    the body of the email (replace "obfs3" with whichever pluggable transport
298
+    you want to use). You should receive an email like this:
299
+    </p>
300
+    <pre>
301
+    Here are your bridges:
200 302
 
303
+      obfs3 60.16.182.53:9001 cc8ca10a63aae8176a52ca5129ce816d011523f5
304
+      obfs3 87.237.118.139:444 0ed110497858f784dfd32d448dc8c0b93fee20ca
305
+      obfs3 60.63.97.221:443 daa5e435819275f88d695cb7fce73ed986878cf3
201 306
     </pre>
202 307
     <p>
203
-    Once you've received the email with bridge information, you can continue the Vidalia configuration steps outlined <a href="#UsingBridges">above</a>.
308
+    Once you've received the email with bridge information, you can
309
+    continue the configuration steps outlined <a href="#UsingBridges">above</a>.
204 310
     </p>
205
-    
311
+
206 312
     <a id="RunningABridge"></a>
207 313
     <h2><a class="anchor" href="#RunningABridge">Running a Tor Bridge</a></h2>
208 314
     <hr>
209
-    
315
+
210 316
     <p>
211 317
     If you want to help out, you should <a href="<page
212 318
     docs/faq>#RelayOrBridge">decide whether you want to run a normal Tor
... ...
@@ -226,18 +332,18 @@
226 332
     settings page"></li>
227 333
     </ul>
228 334
     </p>
229
-    
335
+
230 336
     <p>If you get "Could not bind to 0.0.0.0:443: Permission denied" errors
231 337
     on startup, you'll need to pick a higher ORPort (e.g. 8080) or do <a
232 338
     href="<page docs/faq>#HowcanImakemyrelayaccessibletopeoplestuckbehindrestrictivefirewalls">some
233 339
     complex port forwarding</a>.
234 340
     </p>
235
-    
341
+
236 342
     <p>
237 343
     When configured as a bridge, your server will <b>not</b> appear in the public
238 344
     Tor network.
239 345
     </p>
240
-    
346
+
241 347
     <p>
242 348
     Your bridge relay will automatically publish its address to the bridge
243 349
     authority, which will give it out via https or email as above. You can
... ...
@@ -248,7 +354,7 @@
248 354
     fingerprint in your Tor log files or in <tt>/var/lib/tor/fingerprint</tt>
249 355
     depending on your platform).
250 356
     </p>
251
-    
357
+
252 358
     <p>
253 359
     If you would like to learn more about our bridge
254 360
     design from a technical standpoint, please read the <a
... ...
@@ -265,5 +371,5 @@
265 371
   <!-- END SIDECOL -->
266 372
 </div>
267 373
 <!-- END CONTENT -->
268
-#include <foot.wmi>  
374
+#include <foot.wmi>
269 375
 
... ...
@@ -9,17 +9,17 @@
9 9
 #
10 10
 # url - the path to the wml page, as used the the <page> tag. This tag ensures
11 11
 # that links will point to the current language if supported, and alternately
12
-# the english version 
12
+# the english version
13 13
 #
14 14
 # txt - the link text to be displayed. Different translations will
15
-# need to supply alternate txt 
15
+# need to supply alternate txt
16 16
 
17 17
 <:
18 18
   my $sidenav;
19 19
   $sidenav = [
20 20
       {'url'  => 'docs/documentation',
21 21
        'txt'  => 'Documentation Overview',
22
-      }, 
22
+      },
23 23
       {
24 24
        'url'  => 'docs/installguide',
25 25
        'txt'  => 'Installation Guides',
... ...
@@ -63,13 +63,13 @@
63 63
           },
64 64
           {'url'  => 'docs/tor-hidden-service',
65 65
            'txt'  => 'Configuring a Hidden Service',
66
-          }, 
67
-          {'url'  => 'docs/bridges',
68
-           'txt'  => 'Configuring a Bridge Relay',
69
-          }, 
66
+          },
70 67
           {'url'  => 'docs/running-a-mirror',
71 68
            'txt'  => 'Configuring a Mirror',
72 69
           },
70
+          {'url'  => 'docs/bridges',
71
+           'txt'  => 'Using a Bridge Relay',
72
+          },
73 73
           {'url'  => 'docs/tor-manual',
74 74
            'txt'  => 'Tor -stable Manual',
75 75
           },
... ...
@@ -82,7 +82,7 @@
82 82
        'txt'  => 'Tor Wiki',
83 83
       },
84 84
       {'url'  => 'docs/faq',
85
-       'txt'  => 'General FAQ',  
85
+       'txt'  => 'General FAQ',
86 86
       },
87 87
       {'url'  => 'docs/faq-abuse',
88 88
        'txt'  => 'Abuse FAQ',
... ...
@@ -95,6 +95,6 @@
95 95
       },
96 96
       {'url'  => 'eff/tor-dmca-response',
97 97
        'txt'  => 'Tor DMCA Response',
98
-      },  
98
+      },
99 99
   ];
100 100
 :>
101 101
new file mode 100644
102 102
Binary files /dev/null and b/images/tb-bridge-networksettings.png differ
103 103
new file mode 100644
104 104
Binary files /dev/null and b/images/tb-bridges-custom-from-browser.png differ
105 105
new file mode 100644
106 106
Binary files /dev/null and b/images/tb-bridges-options-from-browser.png differ
107 107
new file mode 100644
108 108
Binary files /dev/null and b/images/tb-bridges-provided-from-browser.png differ
109 109
new file mode 100644
110 110
Binary files /dev/null and b/images/tb-frontpage.png differ
111 111
new file mode 100644
112 112
Binary files /dev/null and b/images/tb-tor-button-menu.png differ
113 113
new file mode 100644
114 114
Binary files /dev/null and b/images/tb-tor-launcher-bridges-custom.png differ
115 115
new file mode 100644
116 116
Binary files /dev/null and b/images/tb-tor-launcher-bridges-options.png differ
117 117
new file mode 100644
118 118
Binary files /dev/null and b/images/tb-tor-launcher-bridges-provided.png differ
119 119
new file mode 100644
120 120
Binary files /dev/null and b/images/tb-tor-launcher-isp-interference.png differ
121 121
new file mode 100644
122 122
Binary files /dev/null and b/images/tb-tor-launcher-no-proxy.png differ
123 123
new file mode 100644
124 124
Binary files /dev/null and b/images/tb-tor-launcher-startup.png differ