Browse code

Merge branch 'master' of git-rw.torproject.org:project/web/webwml into irl-patch

hiromipaw authored on07/02/2018 11:40:27
Showing29 changed files
... ...
@@ -3,4 +3,8 @@
3 3
 .deps
4 4
 *.html.en
5 5
 *.html.es
6
-*~.*
6
+\#*\#
7
+.#*
8
+*~
9
+*.swp
10
+*.swo
... ...
@@ -15,7 +15,7 @@
15 15
 # website component, and set it to needs_review.
16 16
 
17 17
 export STABLETAG=tor-0.3.2.9
18
-#export DEVTAG=tor-0.3.2.8-rc
18
+export DEVTAG=tor-0.3.3.1-alpha
19 19
 
20 20
 WMLBASE=.
21 21
 SUBDIRS=docs eff projects press about download getinvolved donate docs/torbutton
... ...
@@ -101,12 +101,21 @@
101 101
     
102 102
 	<a id="security"></a>
103 103
 	<h3><a class="anchor" href="#security">Security Issues</a></h3>
104
-	<p>If you've found a security issue in one of our projects or our
105
-	infrastructure, please email the respective maintainer. You can find
106
-	their GPG fingerprint/key on our <a
107
-	href="https://db.torproject.org">developer ldap search page</a>. Due
108
-	to the many different projects we have, we do not offer a single
109
-	list for security issues.</p>
104
+	<p>If you've found a security issue in one of our projects or in our
105
+	infrastructure, please email tor-security@lists.torproject.org. 
106
+	You can get the GPG public key for the list by contacting 
107
+	tor-security-sendkey@lists.torproject.org or from 
108
+	pool.sks-keyservers.net. Here is the fingerprint:
109
+	<blockquote><pre>
110
+	gpg --fingerprint tor-security@lists.torproject.org
111
+	pub   4096R/1A7BF184 2017-03-13
112
+	      Key fingerprint = 8B90 4624 C5A2 8654 E453  9BC2 E135 A8B4 1A7B F184
113
+	uid                  tor-security@lists.torproject.org <tor-security@lists.torproject.org>
114
+	uid                  tor-security@lists.torproject.org <tor-security-owner@lists.torproject.org>
115
+	uid                  tor-security@lists.torproject.org <tor-security-request@lists.torproject.org>
116
+	sub   4096R/C00942E4 2017-03-13
117
+	</pre></blockquote>
118
+	</p>
110 119
 
111 120
 	<a id="badrelays"></a>
112 121
 	<h3><a class="anchor" href="#badrelays">Report Bad Relays</a></h3>
... ...
@@ -174,6 +174,9 @@ all the users who contact the support desk.</dd>
174 174
 <dt>Chris Palmer</dt><dd>Our liaison and tech guy with EFF while EFF
175 175
 was funding us. Also helped advocate and write end-user docs.</dd>
176 176
 
177
+<dt>Brad Parker</dt><dd>Prior chief financial &amp; grants officer at the Tor
178
+Project.</dd>
179
+
177 180
 <dt>Martin Peck</dt><dd>Worked on a VM-based transparent
178 181
 proxying approach for Tor clients on Windows.</dd>
179 182
 
... ...
@@ -120,15 +120,6 @@
120 120
   </tr>
121 121
 
122 122
   <tr>
123
-    <td>
124
-      <a id="bparker"></a>
125
-      <div class="photo"><img src="$(IMGROOT)/people/bparker.png" alt="bparker" /></div>
126
-      <div class="icon"><a href="../keys/bparker.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div>
127
-      <div class="name"><a href="#bparker">Brad Parker</a></div>
128
-      <div class="field"><b>IRC:</b> bparker</div>
129
-      <div class="description">Chief financial &amp; grants officer at the Tor Project.</div>
130
-    </td>
131
-
132 123
     <td>
133 124
       <a id="brade"></a>
134 125
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -137,9 +128,7 @@
137 128
       <div class="field"><b>IRC:</b> brade</div>
138 129
       <div class="description">Developer on the Tor Browser team.</div>
139 130
     </td>
140
-  </tr>
141 131
 
142
-  <tr>
143 132
     <td>
144 133
       <a id="komlo"></a>
145 134
       <div class="photo"><img src="$(IMGROOT)/people/komlo.png" alt="komlo" /></div>
... ...
@@ -149,7 +138,9 @@
149 138
       <div class="field"><b>IRC:</b> komlo</div>
150 139
       <div class="description">Chelsea is a software/security engineer and contributes to core tor.</div>
151 140
     </td>
141
+  </tr>
152 142
 
143
+  <tr>
153 144
     <td>
154 145
       <a id="cindy"></a>
155 146
       <div class="photo"><img src="$(IMGROOT)/people/cindy.png" alt="cindy" /></div>
... ...
@@ -157,9 +148,7 @@
157 148
       <div class="name"><a href="#cindy">Cindy Cohn</a></div>
158 149
       <div class="description">Tor Board member and <a href="https://www.eff.org/about/staff/cindy-cohn">Executive Director of the EFF</a>. Lawyer by training, <a href="https://blog.torproject.org/blog/tor-heart-notes-board-member">my focus</a> is on making sure Tor stays available and that Tor users stay safe.</div>
159 150
     </td>
160
-  </tr>
161 151
 
162
-  <tr>
163 152
     <td>
164 153
       <a id="Phoul"></a>
165 154
       <div class="photo"><img src="$(IMGROOT)/people/phoul.png" alt="phoul" /></div>
... ...
@@ -169,7 +158,9 @@
169 158
       <div class="field"><b>IRC:</b> Phoul</div>
170 159
       <div class="description">Support and translation coordinator, GSoC administrator, member of the community team and a director of <a href="https://www.coldhak.ca">Coldhak</a>.</div>
171 160
     </td>
161
+  </tr>
172 162
 
163
+  <tr>
173 164
     <td>
174 165
       <a id="atagar"></a>
175 166
       <div class="photo"><img src="$(IMGROOT)/people/atagar.png" alt="atagar" /></div>
... ...
@@ -178,9 +169,7 @@
178 169
       <div class="field"><b>IRC:</b> atagar</div>
179 170
       <div class="description">Author of the <a href="https://stem.torproject.org/">Stem</a> python controller library and <a href="https://nyx.torproject.org/">Nyx</a> relay monitor.</div>
180 171
     </td>
181
-  </tr>
182 172
 
183
-  <tr>
184 173
     <td>
185 174
       <a id="dgoulet"></a>
186 175
       <div class="photo"><img src="$(IMGROOT)/people/dgoulet.png" alt="dgoulet" /></div>
... ...
@@ -189,7 +178,9 @@
189 178
       <div class="field"><b>IRC:</b> dgoulet</div>
190 179
       <div class="description">Tor development team focusing on onion services and our torsocks maintainer.</div>
191 180
     </td>
181
+  </tr>
192 182
 
183
+  <tr>
193 184
     <td>
194 185
       <a id="dawuud"></a>
195 186
       <div class="photo"><img src="$(IMGROOT)/people/dawuud.png" alt="dawuud" /></div>
... ...
@@ -199,9 +190,7 @@
199 190
       <div class="field"><b>IRC:</b> dawuud</div>
200 191
       <div class="description"><a href="https://github.com/david415/">Author of roflcoptor and honeybadger</a>. Researches mixnets and contributes to txtorcon.</div>
201 192
     </td>
202
-  </tr>
203 193
 
204
-  <tr>
205 194
     <td>
206 195
       <a id="DonnchaC"></a>
207 196
       <div class="photo"><img src="$(IMGROOT)/people/donnchac.png" alt="donnchac" /></div>
... ...
@@ -211,7 +200,9 @@
211 200
       <div class="field"><b>IRC:</b> DonnchaC</div>
212 201
       <div class="description">Onion services developer, OnionBalance developer, hunter of bad relays.</div>
213 202
     </td>
203
+  </tr>
214 204
 
205
+  <tr>
215 206
     <td>
216 207
       <a id="ewyatt"></a>
217 208
       <div class="photo"><img src="$(IMGROOT)/people/ewyatt.png" alt="ewyatt" /></div>
... ...
@@ -220,9 +211,7 @@
220 211
       <div class="field"><b>IRC:</b> ewyatt</div>
221 212
       <div class="description">Non-technical switchboard for people-related things: recruiting, onboarding, benefits, contracts, TPI policy questions, and baked goods.</div>
222 213
     </td>
223
-  </tr>
224 214
 
225
-  <tr>
226 215
     <td>
227 216
       <a id="biella"></a>
228 217
       <div class="photo"><img src="$(IMGROOT)/people/biella.png" alt="biella" /></div>
... ...
@@ -232,7 +221,9 @@
232 221
       <div class="field"><b>IRC:</b> biella</div>
233 222
       <div class="description"><a href="http://gabriellacoleman.org/">Anthropologist</a> and Wolfe Chair in Scientific and Technological Literacy at McGill University.</div>
234 223
     </td>
224
+  </tr>
235 225
 
226
+  <tr>
236 227
     <td>
237 228
       <a id="gman999"></a>
238 229
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -240,9 +231,7 @@
240 231
       <div class="field"><b>IRC:</b> gman999</div>
241 232
       <div class="description">Tor BSD Diversity Project member, long-time relay operator, trainer.</div>
242 233
     </td>
243
-  </tr>
244 234
 
245
-  <tr>
246 235
     <td>
247 236
       <a id="GeKo"></a>
248 237
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -251,7 +240,9 @@
251 240
       <div class="field"><b>IRC:</b> GeKo</div>
252 241
       <div class="description">Currently lead of the Tor Browser team.</div>
253 242
     </td>
243
+  </tr>
254 244
 
245
+  <tr>
255 246
     <td>
256 247
       <a id="asn"></a>
257 248
       <div class="photo"><img src="$(IMGROOT)/people/asn.png" alt="asn" /></div>
... ...
@@ -260,9 +251,7 @@
260 251
       <div class="field"><b>IRC:</b> asn</div>
261 252
       <div class="description">Onion services. Security analysis. Used to obfsproxy. Follower of the onion.</div>
262 253
     </td>
263
-  </tr>
264 254
 
265
-  <tr>
266 255
     <td>
267 256
       <a id="saint"></a>
268 257
       <div class="photo"><img src="$(IMGROOT)/people/saint.png" alt="saint" /></div>
... ...
@@ -272,7 +261,9 @@
272 261
       <div class="field"><b>IRC:</b> saint</div>
273 262
       <div class="description">Tamper-resistant software distribution, censorship detection, <a href="https://github.com/glamrock/cupcake">Cupcake</a>, and security training of activists and domestic violence survivors.</div>
274 263
     </td>
264
+  </tr>
275 265
 
266
+  <tr>
276 267
     <td>
277 268
       <a id="irl"></a>
278 269
       <div class="photo"><img src="$(IMGROOT)/people/irl.png" alt="irl" /></div>
... ...
@@ -282,9 +273,7 @@
282 273
       <div class="field"><b>IRC:</b> irl</div>
283 274
       <div class="description"><a href="https://metrics.torproject.org">Metrics team member</a> and maintainer of <a href="https://atlas.torproject.org/">Relay Search</a>.</div>
284 275
     </td>
285
-  </tr>
286 276
 
287
-  <tr>
288 277
     <td>
289 278
       <a id="ian"></a>
290 279
       <div class="photo"><img src="$(IMGROOT)/people/ian.png" alt="ian" /></div>
... ...
@@ -292,7 +281,9 @@
292 281
       <div class="name"><a href="#ian">Ian Goldberg</a></div>
293 282
       <div class="description"><a href="https://cs.uwaterloo.ca/~iang/">Professor of CS</a> at the <a href="https://uwaterloo.ca/">University of Waterloo</a>, developing <a href="https://otr.cypherpunks.ca/">Off-the-Record Messaging</a> among other things.</div>
294 283
     </td>
284
+  </tr>
295 285
 
286
+  <tr>
296 287
     <td>
297 288
       <a id="intrigeri"></a>
298 289
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -300,9 +291,7 @@
300 291
       <div class="name"><a href="#intrigeri">intrigeri</a></div>
301 292
       <div class="description">Our main interface with the <a href="https://tails.boum.org/">Tails</a> project.</div>
302 293
     </td>
303
-  </tr>
304 294
 
305
-  <tr>
306 295
     <td>
307 296
       <a id="isabela"></a>
308 297
       <div class="photo"><img src="$(IMGROOT)/people/isabela.png" alt="isabela" /></div>
... ...
@@ -312,7 +301,9 @@
312 301
       <div class="field"><b>IRC:</b> isabela</div>
313 302
       <div class="description">Coordinates Tor's development teams and roadmaps. Keeps track of priorities, and ensures Tor always thinks of the &quot;user first&quot;.</div>
314 303
     </td>
304
+  </tr>
315 305
 
306
+  <tr>
316 307
     <td>
317 308
       <a id="isis"></a>
318 309
       <div class="photo"><img src="$(IMGROOT)/people/isis.png" alt="isis" /></div>
... ...
@@ -322,9 +313,7 @@
322 313
       <div class="field"><b>IRC:</b> isis</div>
323 314
       <div class="description">Tor developer working on censorship circumvention, <a href="https://gitweb.torproject.org/bridgedb.git">BridgeDB</a>, and cryptographic research, design, and implementations.</div>
324 315
     </td>
325
-  </tr>
326 316
 
327
-  <tr>
328 317
     <td>
329 318
       <a id="ilv"></a>
330 319
       <div class="photo"><img src="$(IMGROOT)/people/ilv.png" alt="ilv" /></div>
... ...
@@ -333,7 +322,9 @@
333 322
       <div class="field"><b>IRC:</b> ilv</div>
334 323
       <div class="description">Rewrote the <a href="https://gettor.torproject.org">GetTor</a> service. Volunteer on the <a href="https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam">Community Team</a>, focused on Latin America. Works in <a href="https://www.derechosdigitales.org">Derechos Digitales</a>.</div>
335 324
     </td>
325
+  </tr>
336 326
 
327
+  <tr>
337 328
     <td>
338 329
       <a id="iwakeh"></a>
339 330
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -341,9 +332,7 @@
341 332
       <div class="name"><a href="#iwakeh">iwakeh</a></div>
342 333
       <div class="description">Speaks Java and other languages, streamlines build processes, and scrutinizes mathematical concepts behind aggregating tons of Tor network data.</div>
343 334
     </td>
344
-  </tr>
345 335
 
346
-  <tr>
347 336
     <td>
348 337
       <a id="redshiftzero"></a>
349 338
       <div class="photo"><img src="$(IMGROOT)/people/redshiftzero.png" alt="redshiftzero" /></div>
... ...
@@ -353,7 +342,9 @@
353 342
       <div class="field"><b>IRC:</b> redshiftzero</div>
354 343
       <div class="description">Lead developer of the <a href="https://securedrop.org/">SecureDrop</a> whistleblower platform based at the <a href="https://freedom.press/">Freedom of the Press Foundation</a>.</div>
355 344
     </td>
345
+  </tr>
356 346
 
347
+  <tr>
357 348
     <td>
358 349
       <a id="qbi"></a>
359 350
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -363,9 +354,7 @@
363 354
       <div class="field"><b>IRC:</b> qbi</div>
364 355
       <div class="description">Volunteer that helped translate the website, is part of TorServers.net, and Tor's sysadmin team.</div>
365 356
     </td>
366
-  </tr>
367 357
 
368
-  <tr>
369 358
     <td>
370 359
       <a id="jselon"></a>
371 360
       <div class="photo"><img src="$(IMGROOT)/people/jselon.png" alt="jselon" /></div>
... ...
@@ -374,7 +363,9 @@
374 363
       <div class="field"><b>IRC:</b> jselon</div>
375 364
       <div class="description">Event Coordination, donor management, general office operations.</div>
376 365
     </td>
366
+  </tr>
377 367
 
368
+  <tr>
378 369
     <td>
379 370
       <a id="julius"></a>
380 371
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -383,9 +374,7 @@
383 374
       <div class="name"><a href="#julius">Julius Mittenzwei</a></div>
384 375
       <div class="description">Germany-based lawyer and Internet activist.</div>
385 376
     </td>
386
-  </tr>
387 377
 
388
-  <tr>
389 378
     <td>
390 379
       <a id="juris"></a>
391 380
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -394,7 +383,9 @@
394 383
       <div class="field"><b>IRC:</b> juris</div>
395 384
       <div class="description">Board member of torservers.net.</div>
396 385
     </td>
386
+  </tr>
397 387
 
388
+  <tr>
398 389
     <td>
399 390
       <a id="karsten"></a>
400 391
       <div class="photo"><img src="$(IMGROOT)/people/karsten.png" alt="karsten" /></div>
... ...
@@ -403,9 +394,7 @@
403 394
       <div class="field"><b>IRC:</b> karsten</div>
404 395
       <div class="description">Primary researcher and developer into <a href="https://metrics.torproject.org/">anonymous metrics</a> which started as a National Science Foundation grant.</div>
405 396
     </td>
406
-  </tr>
407 397
 
408
-  <tr>
409 398
     <td>
410 399
       <a id="kat5"></a>
411 400
       <div class="photo"><img src="$(IMGROOT)/people/kat5.png" alt="kat5" /></div>
... ...
@@ -413,7 +402,9 @@
413 402
       <div class="field"><b>IRC:</b> kat5</div>
414 403
       <div class="description">Volunteer on the Community Team. Helps with t-shirts for relay operators and other odds and ends.</div>
415 404
     </td>
405
+  </tr>
416 406
 
407
+  <tr>
417 408
     <td>
418 409
       <a id="ailanthus"></a>
419 410
       <div class="photo"><img src="$(IMGROOT)/people/ailanthus.png" alt="ailanthus" /></div>
... ...
@@ -423,16 +414,16 @@
423 414
       <div class="field"><b>IRC:</b> ailanthus</div>
424 415
       <div class="description">Writes about Tor in mainstream and technical publications and conducts community workshops to teach people about Tor.</div>
425 416
     </td>
426
-  </tr>
427 417
 
428
-  <tr>
429 418
     <td>
430 419
       <a id="leif"></a>
431 420
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
432 421
       <div class="name"><a href="#leif">Leif Ryge</a></div>
433 422
       <div class="description">Works on security analysis, designer of &quot;bananaphone&quot; transport.</div>
434 423
     </td>
424
+  </tr>
435 425
 
426
+  <tr>
436 427
     <td>
437 428
       <a id="linda"></a>
438 429
       <div class="photo"><img src="$(IMGROOT)/people/linda.png" alt="linda" /></div>
... ...
@@ -441,9 +432,7 @@
441 432
       <div class="field"><b>IRC:</b> linda</div>
442 433
       <div class="description">UX team lead.</div>
443 434
     </td>
444
-  </tr>
445 435
 
446
-  <tr>
447 436
     <td>
448 437
       <a id="ln5"></a>
449 438
       <div class="photo"><img src="$(IMGROOT)/people/ln5.png" alt="ln5" /></div>
... ...
@@ -453,7 +442,9 @@
453 442
       <div class="field"><b>IRC:</b> ln5</div>
454 443
       <div class="description">Swedish advocate and Tor Board member. Works on implementing IPv6 in Tor, build automation, and runs a directory authority.</div>
455 444
     </td>
445
+  </tr>
456 446
 
447
+  <tr>
457 448
     <td>
458 449
       <a id="agrabeli"></a>
459 450
       <div class="photo"><img src="$(IMGROOT)/people/agrabeli.png" alt="agrabeli" /></div>
... ...
@@ -463,9 +454,7 @@
463 454
       <div class="field"><b>IRC:</b> agrabeli</div>
464 455
       <div class="description">Maria manages OONI's Partnership Program and writes research reports on internet censorship around the world.</div>
465 456
     </td>
466
-  </tr>
467 457
 
468
-  <tr>
469 458
     <td>
470 459
       <a id="mcs"></a>
471 460
       <div class="photo"><img src="$(IMGROOT)/people/mcs.png" alt="mcs" /></div>
... ...
@@ -474,7 +463,9 @@
474 463
       <div class="field"><b>IRC:</b> mcs</div>
475 464
       <div class="description">Developer on the Tor Browser team.</div>
476 465
     </td>
466
+  </tr>
477 467
 
468
+  <tr>
478 469
     <td>
479 470
       <a id="matt"></a>
480 471
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -482,9 +473,7 @@
482 473
       <div class="name"><a href="#matt">Matt Blaze</a></div>
483 474
       <div class="description">Chairs the Tor Board of Directors. Professor at the University of Pennsylvania where he researches security, privacy, and anonymity.</div>
484 475
     </td>
485
-  </tr>
486 476
 
487
-  <tr>
488 477
     <td>
489 478
       <a id="pastly"></a>
490 479
       <div class="photo"><img src="$(IMGROOT)/people/pastly.png" alt="pastly" /></div>
... ...
@@ -493,7 +482,9 @@
493 482
       <div class="field"><b>IRC:</b> pastly</div>
494 483
       <div class="description"><a href="http://mattttttssi4lhud.onion/">Implemented</a> the <a href="http://www.robgjansen.com/publications/kist-sec2014.pdf">KIST scheduler</a> into Tor. Helps safely measure Tor. Says helpful things on IRC.</div>
495 484
     </td>
485
+  </tr>
496 486
 
487
+  <tr>
497 488
     <td>
498 489
       <a id="sysrqb"></a>
499 490
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -503,9 +494,7 @@
503 494
       <div class="field"><b>IRC:</b> sysrqb</div>
504 495
       <div class="description">Worked on tor, torsocks, and many other projects. Helped maintain and develop BridgeDB.</div>
505 496
     </td>
506
-  </tr>
507 497
 
508
-  <tr>
509 498
     <td>
510 499
       <a id="meejah"></a>
511 500
       <div class="photo"><img src="$(IMGROOT)/people/meejah.png" alt="meejah" /></div>
... ...
@@ -515,7 +504,9 @@
515 504
       <div class="field"><b>IRC:</b> meejah</div>
516 505
       <div class="description"><a href="https://meejah.ca">Author</a> of <a href="https://github.com/meejah/txtorcon">txtorcon</a>, <a href="https://github.com/meejah/carml">carml</a> and other Tor Python tools including some for bad-relay hunting.</div>
517 506
     </td>
507
+  </tr>
518 508
 
509
+  <tr>
519 510
     <td>
520 511
       <a id="mtigas"></a>
521 512
       <div class="photo"><img src="$(IMGROOT)/people/mtigas.png" alt="mtigas" /></div>
... ...
@@ -525,9 +516,7 @@
525 516
       <div class="field"><b>IRC:</b> mtigas</div>
526 517
       <div class="description">Works on <a href="https://mike.tig.as/onionbrowser/">Onion Browser</a>, iOS, and hacker-journalist at <a href="https://www.propublica.org/">ProPublica</a> running their <a href="https://www.propub3r6espa33w.onion/">onion service</a>.</div>
527 518
     </td>
528
-  </tr>
529 519
 
530
-  <tr>
531 520
     <td>
532 521
       <a id="moritz"></a>
533 522
       <div class="photo"><img src="$(IMGROOT)/people/moritz.png" alt="moritz" /></div>
... ...
@@ -536,7 +525,9 @@
536 525
       <div class="name"><a href="#moritz">Moritz Bartl</a></div>
537 526
       <div class="description">Co-founder of <a href="https://www.torservers.net/">torservers.net</a>, a network of non-profit organizations that run Tor exit relays.</div>
538 527
     </td>
528
+  </tr>
539 529
 
530
+  <tr>
540 531
     <td>
541 532
       <a id="n8fr8"></a>
542 533
       <div class="photo"><img src="$(IMGROOT)/people/n8fr8.png" alt="n8fr8" /></div>
... ...
@@ -545,9 +536,7 @@
545 536
       <div class="field"><b>IRC:</b> n8fr8</div>
546 537
       <div class="description">Founder of the <a href="https://guardianproject.info/">Guardian Project</a>. Orbot lead developer and contributor to Orfox, Onion Browser and NetCipher SDK. Director of Technology at Tibet Action Institute.</div>
547 538
     </td>
548
-  </tr>
549 539
 
550
-  <tr>
551 540
     <td>
552 541
       <a id="nickhopper"></a>
553 542
       <div class="photo"><img src="$(IMGROOT)/people/nickhopper.png" alt="nickhopper" /></div>
... ...
@@ -555,7 +544,9 @@
555 544
       <div class="field"><b>IRC:</b> nickhopper</div>
556 545
       <div class="description"><a href="https://www-users.cs.umn.edu/~hopper/">Researcher</a> interested in improving Tor's performance and resistance to traffic analysis. Some of my work is described <a href="https://www-users.cs.umn.edu/~hopper/research.html">here</a>.</div>
557 546
     </td>
547
+  </tr>
558 548
 
549
+  <tr>
559 550
     <td>
560 551
       <a id="nickm"></a>
561 552
       <div class="photo"><img src="$(IMGROOT)/people/nickm.png" alt="nickm" /></div>
... ...
@@ -565,9 +556,7 @@
565 556
       <div class="field"><b>IRC:</b> nickm</div>
566 557
       <div class="description">One of the three original designers of Tor - does a lot of the ongoing design work, and coordinates and leads ongoing development.</div>
567 558
     </td>
568
-  </tr>
569 559
 
570
-  <tr>
571 560
     <td>
572 561
       <a id="boklm"></a>
573 562
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -576,7 +565,9 @@
576 565
       <div class="field"><b>IRC:</b> boklm</div>
577 566
       <div class="description">Works on Tor Browser.</div>
578 567
     </td>
568
+  </tr>
579 569
 
570
+  <tr>
580 571
     <td>
581 572
       <a id="mrphs"></a>
582 573
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -586,9 +577,7 @@
586 577
       <div class="field"><b>IRC:</b> mrphs</div>
587 578
       <div class="description">His main area of interests are End-users Accessibility/Security, UX, Censorship, Advocacy and Onion Services.</div>
588 579
     </td>
589
-  </tr>
590 580
 
591
-  <tr>
592 581
     <td>
593 582
       <a id="syverson"></a>
594 583
       <div class="photo"><img src="$(IMGROOT)/people/syverson.png" alt="syverson" /></div>
... ...
@@ -596,7 +585,9 @@
596 585
       <div class="field"><b>IRC:</b> syverson</div>
597 586
       <div class="description"><a href="https://www.nrl.navy.mil">NRL</a> researcher on most things Tor. Inventor of <a href="https://www.onion-router.net/">onion routing</a>, and one of the three original designers of Tor.</div>
598 587
     </td>
588
+  </tr>
599 589
 
590
+  <tr>
600 591
     <td>
601 592
       <a id="pepijn"></a>
602 593
       <div class="photo"><img src="$(IMGROOT)/people/pepijn.png" alt="pepijn" /></div>
... ...
@@ -605,16 +596,16 @@
605 596
       <div class="name"><a href="#pepijn">Pepijn Le Heux</a></div>
606 597
       <div class="description">Lawyer based in The Netherlands and co-founder of Hart voor Internetvrijheid.</div>
607 598
     </td>
608
-  </tr>
609 599
 
610
-  <tr>
611 600
     <td>
612 601
       <a id="peter"></a>
613 602
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
614 603
       <div class="name"><a href="#peter">Peter Palfrader</a></div>
615 604
       <div class="description">Manages the Debian packages, runs one of the directory authorities, and generally helps out a lot.</div>
616 605
     </td>
606
+  </tr>
617 607
 
608
+  <tr>
618 609
     <td>
619 610
       <a id="phw"></a>
620 611
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -624,9 +615,7 @@
624 615
       <div class="field"><b>IRC:</b> phw</div>
625 616
       <div class="description">Maintains <a href="https://gitweb.torproject.org/user/phw/exitmap.git/">exitmap</a> and <a href="https://gitweb.torproject.org/user/phw/sybilhunter.git/">sybilhunter</a>, works on <a href="https://trac.torproject.org/projects/tor/wiki/doc/ReportingBadRelays">bad relay detection</a>, and does <a href="https://nymity.ch/papers.html">security and privacy research</a>.</div>
626 617
     </td>
627
-  </tr>
628 618
 
629
-  <tr>
630 619
     <td>
631 620
       <a id="robt"></a>
632 621
       <div class="photo"><img src="$(IMGROOT)/people/robt.png" alt="robt" /></div>
... ...
@@ -634,7 +623,9 @@
634 623
       <div class="name"><a href="#robt">Rabbi Rob Thomas</a></div>
635 624
       <div class="description">CEO of Team Cymru, which supports Tor through hosting, research, and infosec assistance.</div>
636 625
     </td>
626
+  </tr>
637 627
 
628
+  <tr>
638 629
     <td>
639 630
       <a id="ramy"></a>
640 631
       <div class="photo"><img src="$(IMGROOT)/people/ramy.png" alt="ramy" /></div>
... ...
@@ -643,9 +634,7 @@
643 634
       <div class="name"><a href="#ramy">Ramy Raoof</a></div>
644 635
       <div class="description">Tor Board member, technologist, and privacy and security researcher.</div>
645 636
     </td>
646
-  </tr>
647 637
 
648
-  <tr>
649 638
     <td>
650 639
       <a id="pospeselr"></a>
651 640
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -655,7 +644,9 @@
655 644
       <div class="field"><b>IRC:</b> pospeselr</div>
656 645
       <div class="description">Tor Browser developer.</div>
657 646
     </td>
647
+  </tr>
658 648
 
649
+  <tr>
659 650
     <td>
660 651
       <a id="robgjansen"></a>
661 652
       <div class="photo"><img src="$(IMGROOT)/people/robgjansen.png" alt="robgjansen" /></div>
... ...
@@ -665,9 +656,7 @@
665 656
       <div class="field"><b>IRC:</b> robgjansen</div>
666 657
       <div class="description"><a href="https://www.nrl.navy.mil">NRL</a> research scientist, <a href="http://www.robgjansen.com/">leading expert in Tor network performance</a>, and author of <a href="https://shadow.github.io/">Shadow</a>.</div>
667 658
     </td>
668
-  </tr>
669 659
 
670
-  <tr>
671 660
     <td>
672 661
       <a id="arma"></a>
673 662
       <div class="photo"><img src="$(IMGROOT)/people/arma.png" alt="arma" /></div>
... ...
@@ -677,7 +666,9 @@
677 666
       <div class="field"><b>IRC:</b> arma</div>
678 667
       <div class="description">Original developer of Tor along with Nick and Paul. Leading privacy researcher, coordinating developers and researchers.</div>
679 668
     </td>
669
+  </tr>
680 670
 
671
+  <tr>
681 672
     <td>
682 673
       <a id="sajolida"></a>
683 674
       <div class="photo"><img src="$(IMGROOT)/people/sajolida.png" alt="sajolida" /></div>
... ...
@@ -685,9 +676,7 @@
685 676
       <div class="name"><a href="#sajolida">sajolida</a></div>
686 677
       <div class="description">Technical writing, UX, and fundraising for Tails.</div>
687 678
     </td>
688
-  </tr>
689 679
 
690
-  <tr>
691 680
     <td>
692 681
       <a id="sebastian"></a>
693 682
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -695,7 +684,9 @@
695 684
       <div class="name"><a href="#sebastian">Sebastian Hahn</a></div>
696 685
       <div class="description">Helps people around the world use and understand Tor better. Generally helps everything run smoothly. Runs one of the directory authorities.</div>
697 686
     </td>
687
+  </tr>
698 688
 
689
+  <tr>
699 690
     <td>
700 691
       <a id="serene"></a>
701 692
       <div class="photo"><img src="$(IMGROOT)/people/serene.png" alt="serene" /></div>
... ...
@@ -704,9 +695,7 @@
704 695
       <div class="name"><a href="#serene">Serene</a></div>
705 696
       <div class="description">Snowflake and Pluggable Transports developer.</div>
706 697
     </td>
707
-  </tr>
708 698
 
709
-  <tr>
710 699
     <td>
711 700
       <a id="ssteele"></a>
712 701
       <div class="photo"><img src="$(IMGROOT)/people/ssteele.png" alt="ssteele" /></div>
... ...
@@ -716,7 +705,9 @@
716 705
       <div class="field"><b>IRC:</b> ssteele</div>
717 706
       <div class="description">Executive Director of the Tor Project, Inc.</div>
718 707
     </td>
708
+  </tr>
719 709
 
710
+  <tr>
720 711
     <td>
721 712
       <a id="hiro"></a>
722 713
       <div class="photo"><img src="$(IMGROOT)/people/hiro.png" alt="hiro" /></div>
... ...
@@ -726,9 +717,7 @@
726 717
       <div class="field"><b>IRC:</b> hiro</div>
727 718
       <div class="description">Hiro builds and runs Tor Project's web applications and services.</div>
728 719
     </td>
729
-  </tr>
730 720
 
731
-  <tr>
732 721
     <td>
733 722
       <a id="inf0"></a>
734 723
       <div class="photo"><img src="$(IMGROOT)/people/inf0.png" alt="inf0" /></div>
... ...
@@ -738,7 +727,9 @@
738 727
       <div class="field"><b>IRC:</b> inf0</div>
739 728
       <div class="description">Directory authority operator, outreach and trains human rights activists. System's Engineer at Team Cymru and co-Founder of accessnow.org.</div>
740 729
     </td>
730
+  </tr>
741 731
 
732
+  <tr>
742 733
     <td>
743 734
       <a id="stephw"></a>
744 735
       <div class="photo"><img src="$(IMGROOT)/people/stephw.png" alt="stephw" /></div>
... ...
@@ -748,9 +739,7 @@
748 739
       <div class="field"><b>IRC:</b> stephw</div>
749 740
       <div class="description">Directs communications.</div>
750 741
     </td>
751
-  </tr>
752 742
 
753
-  <tr>
754 743
     <td>
755 744
       <a id="sjmurdoch"></a>
756 745
       <div class="photo"><img src="$(IMGROOT)/people/sjmurdoch.png" alt="sjmurdoch" /></div>
... ...
@@ -760,7 +749,9 @@
760 749
       <div class="field"><b>IRC:</b> sjmurdoch</div>
761 750
       <div class="description"><a href="http://www.cs.ucl.ac.uk/staff/s.murdoch/">Principal Research Fellow</a> at University College London and original creator of the <a href="https://www.torproject.org/projects/torbrowser.html.en">Tor Browser</a>.</div>
762 751
     </td>
752
+  </tr>
763 753
 
754
+  <tr>
764 755
     <td>
765 756
       <a id="sukhe"></a>
766 757
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -769,9 +760,7 @@
769 760
       <div class="field"><b>IRC:</b> sukhe</div>
770 761
       <div class="description"><a href="https://trac.torproject.org/projects/tor/wiki/torbirdy">TorBirdy</a> and <a href="https://trac.torproject.org/projects/tor/wiki/doc/TorMessenger">Tor Messenger</a> developer. Member of the <a href="https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam">Community Team</a>.</div>
771 762
     </td>
772
-  </tr>
773 763
 
774
-  <tr>
775 764
     <td>
776 765
       <a id="catalyst"></a>
777 766
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -781,7 +770,9 @@
781 770
       <div class="field"><b>IRC:</b> catalyst</div>
782 771
       <div class="description">Software archaeologist and keeper of C language arcana. Works with applied cryptography, protocol design, software security, and technical debt restructuring.</div>
783 772
     </td>
773
+  </tr>
784 774
 
775
+  <tr>
785 776
     <td>
786 777
       <a id="teor"></a>
787 778
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -790,9 +781,7 @@
790 781
       <div class="field"><b>IRC:</b> teor</div>
791 782
       <div class="description">Onion services developer, and core member of Tor dev team. Researches Tor network measurement and onion service scalability.</div>
792 783
     </td>
793
-  </tr>
794 784
 
795
-  <tr>
796 785
     <td>
797 786
       <a id="tjr"></a>
798 787
       <div class="photo"><img src="$(IMGROOT)/people/tjr.png" alt="tjr" /></div>
... ...
@@ -802,7 +791,9 @@
802 791
       <div class="field"><b>IRC:</b> tjr</div>
803 792
       <div class="description">Maintains <a href="https://consensus-health.torproject.org/">Consensus Health </a>, runs one of the bandwidth authorities, and contributes to Tor Browser.</div>
804 793
     </td>
794
+  </tr>
805 795
 
796
+  <tr>
806 797
     <td>
807 798
       <a id="t0mmy"></a>
808 799
       <div class="photo"><img src="$(IMGROOT)/people/t0mmy.png" alt="t0mmy" /></div>
... ...
@@ -812,9 +803,7 @@
812 803
       <div class="field"><b>IRC:</b> t0mmy</div>
813 804
       <div class="description">Writes and edits grant proposals, one-pagers, blogposts, etc.</div>
814 805
     </td>
815
-  </tr>
816 806
 
817
-  <tr>
818 807
     <td>
819 808
       <a id="wseltzer"></a>
820 809
       <div class="photo"><img src="$(IMGROOT)/people/wseltzer.png" alt="wseltzer" /></div>
... ...
@@ -824,7 +813,9 @@
824 813
       <div class="field"><b>IRC:</b> wseltzer</div>
825 814
       <div class="description"><a href="https://wendy.seltzer.org/">Techie lawyer</a> and former Tor board member. She works on legal and policy support for private and secure communications.</div>
826 815
     </td>
816
+  </tr>
827 817
 
818
+  <tr>
828 819
     <td>
829 820
       <a id="yawning"></a>
830 821
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -12,15 +12,15 @@
12 12
 	<div id="maincol">
13 13
 		<h1>The Tor Project is always looking for more great people to join our team!</h1>
14 14
 
15
-		#<p>At the moment, we don't have any official open positions. Please check back
16
-		# soon, though! In the meantime, you may want to glance at our
17
-		#<a href="<page getinvolved/volunteer>">volunteers</a> page.</p>
15
+		<p>At the moment, we don't have any official open positions. Please check back
16
+		 soon, though! In the meantime, you may want to glance at our
17
+		<a href="<page getinvolved/volunteer>">volunteers</a> page.</p>
18 18
 
19
-		<p>Specifically, we're looking for the following people currently:</p>
20
-		<ul>
21
-		  <li><a href="<page about/jobs-cfgo>">Chief Financial and Grants Officer</a></li>
22
-		  <li><a href="<page about/jobs-osdeveloperandroid>">Android OS Developer</a></li>
23
-		</ul>
19
+		#<p>Specifically, we're looking for the following people currently:</p>
20
+		#<ul>
21
+		#  <li><a href="<page about/jobs-cfgo>">Chief Financial and Grants Officer</a></li>
22
+		#  <li><a href="<page about/jobs-osdeveloperandroid>">Android OS Developer</a></li>
23
+		#</ul>
24 24
 
25 25
 
26 26
 		<p>In the past, we looked for the following people:</p>
... ...
@@ -36,6 +36,8 @@
36 36
 			<li>Executive Director</li>
37 37
 			<li>Executive Administrator</li>
38 38
 		        <li>Browser Developers for Mobile (Android)</li>
39
+			<li>Chief Financial and Grants Officer</li>
40
+			<li>Android OS Developer</li>
39 41
 		</ul>
40 42
 
41 43
 		<p>
42 44
deleted file mode 100644
... ...
@@ -1,99 +0,0 @@
1
-#banner-wrapper {
2
-    -khtml-user-select: none;    /* Konqueror */
3
-    -moz-user-select: none;      /* Firefox */
4
-    -ms-user-select: none;       /* Internet Explorer/Edge */
5
-    -webkit-touch-callout: none; /* iOS Safari */
6
-    -webkit-user-select: none;   /* Chrome/Safari/Opera */
7
-    display: block;
8
-    height: 150px;
9
-    justify-content: center;
10
-    left: 0px;
11
-    margin-top: 0px;
12
-    min-width: 900px;
13
-    opacity: 1;
14
-    position: absolute;
15
-    user-select: none;
16
-    width: 100%;
17
-    z-index: 1;
18
-}
19
-#banner-wrapper:before {
20
-    background-color: #551373;
21
-    background-image: url('../images/onion-hand.png');
22
-    background-position: calc(50% - 40px) 50%;
23
-    background-size: cover;
24
-    content: "";
25
-    height: 150px;
26
-    left: 0px;
27
-    position: absolute;
28
-    top: 0px;
29
-    right: 0px;
30
-}
31
-#banner-contents-container {
32
-    align-items: center;
33
-    height: 100%;
34
-    margin: 0 auto;
35
-    max-width: 960px;
36
-    position: relative;
37
-    width: 960px;
38
-}
39
-#banner-tagline {
40
-    align-items: center;
41
-    bottom: 60px;
42
-    color: white;
43
-    display: flex;
44
-    font-family: monospace;
45
-    font-weight: bold;
46
-    left: 200px;
47
-    position: absolute;
48
-    right: 0px;
49
-    text-align: start;
50
-    text-transform: uppercase;
51
-    top: 10px;
52
-}
53
-#banner-slogan {
54
-    align-items: center;
55
-    bottom: 30px;
56
-    color: #f8f8a0;
57
-    display: flex;
58
-    font-size: 20px;
59
-    font-family: monospace;
60
-    font-weight: bold;
61
-    left: 200px;
62
-    position: absolute;
63
-    right: 285px;
64
-    text-align: start;
65
-    top: 90px;
66
-    white-space: nowrap;
67
-}
68
-#banner-donate-button {
69
-    align-items: center;
70
-    background-color: #13a513;
71
-    border: 0px;
72
-    bottom: 10px;
73
-    color: #fbf7ef;
74
-    display: flex;
75
-    font-family: sans-serif;
76
-    font-size: 22px;
77
-    font-weight: bold;
78
-    justify-content: center;
79
-    left: 630px;
80
-    letter-spacing: -0.00em;
81
-    position: absolute;
82
-    right: 10px;
83
-    top: 90px;
84
-}
85
-#banner-donate-button:hover {
86
-    background-color: #38bc38;
87
-}
88
-#banner-spacer {
89
-    background-color: #551373;
90
-    display: block;
91
-    height: 150px;
92
-    position: relative;
93
-    top: 0px;
94
-    left: 0px;
95
-    width: 100%;
96
-}
97
-body {
98
-    min-width: 960px;
99
-}
... ...
@@ -75,9 +75,9 @@ I run
75 75
 <option value="stretch" selected="selected">Debian stable (stretch)</option>
76 76
 <option value="testing">Debian testing (buster)</option>
77 77
 <option value="sid">Debian unstable (sid)</option>
78
-<option value="precise">Ubuntu Precise Pangolin</option>
79 78
 <option value="trusty">Ubuntu Trusty Tahr</option>
80 79
 <option value="xenial">Ubuntu Xenial Xerus</option>
80
+<option value="zesty">Ubuntu Zesty Zapus</option>
81 81
 </select>
82 82
 and want
83 83
 <select id="package"></select>
84 84
deleted file mode 100644
... ...
@@ -1,47 +0,0 @@
1
-## translation metadata
2
-# Revision: $Revision$
3
-# Translation-Priority: 3-low
4
-
5
-#include "head.wmi" TITLE="Tor Project: CentOS/Fedora Instructions" 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 docs/documentation>">Documentation &raquo; </a>
10
-    <a href="<page docs/rpms>">RPMs</a>
11
-  </div>
12
-  <div id="maincol"> 
13
-    <a id="rpms"></a>
14
-    <h2><a class="anchor" href="#rpms">Tor packages for RPM-based
15
-    linux distributions.</a></h2>
16
-    <br>
17
-    
18
-    <h3>Fedora, RHEL, CentOS, Scientific Linux packages</h3>
19
-
20
-    <p>Use native Fedora packages for the Fedora distribution or <a href="https://fedoraproject.org/wiki/EPEL">EPEL</a>
21
-    packages for distribitons derived from RHEL.
22
-    </p>
23
-
24
-    
25
-    <a id="source"></a>
26
-    <h2><a class="anchor" href="#source">Building from source</a></h2>
27
-    <br>
28
-    
29
-    <p>
30
-    If you'd like to build from source, please follow the <a
31
-    href="<gitblob>doc/contrib/tor-rpm-creation.txt">RPM creation instructions</a>.
32
-    </p>
33
-    
34
-    <hr>
35
-    
36
-    <p>If you have suggestions for improving this document, please <a
37
-    href="<page about/contact>">send them to us</a>. Thanks!</p>
38
-  </div>
39
-  <!-- END MAINCOL -->
40
-  <div id = "sidecol">
41
-#include "side.wmi"
42
-#include "info.wmi"
43
-  </div>
44
-  <!-- END SIDECOL -->
45
-</div>
46
-<!-- END CONTENT -->
47
-#include <foot.wmi>  
... ...
@@ -33,24 +33,18 @@
33 33
        'url'  => 'docs/installguide',
34 34
        'txt'  => 'Expert guides',
35 35
        'subelements' => [
36
+          {'url'  => '<wiki>TorRelayGuide',
37
+           'txt'  => 'The Tor Relay Guide',
38
+          },
36 39
           {'url'  => 'docs/debian',
37 40
            'txt'  => 'Installing Tor on Debian/Ubuntu',
38 41
           },
39
-          {'url'  => 'docs/rpms',
40
-           'txt'  => 'Installing Tor on Fedora/CentOS',
41
-          },
42 42
           {'url'  => 'docs/tor-doc-unix',
43 43
            'txt'  => 'Installing Tor Source',
44 44
           },
45 45
           {'url'  => 'docs/tor-doc-osx',
46 46
            'txt'  => 'OSX',
47 47
           },
48
-          {'url'  => 'docs/tor-relay-debian',
49
-           'txt'  => 'Configuring a Relay manually',
50
-          },
51
-          {'url'  => 'docs/tor-doc-relay',
52
-           'txt'  => 'Configuring a Relay graphically',
53
-          },
54 48
           {'url'  => 'docs/tor-onion-service',
55 49
            'txt'  => 'Configuring an Onion Service',
56 50
           },
... ...
@@ -10,118 +10,7 @@
10 10
     <a href="<page docs/tor-doc-relay>">Configure Tor Relay</a>
11 11
   </div>
12 12
   <div id="maincol">
13
-
14
-    <h1>Configuring a Tor relay</h1>
15
-
16
-    <hr>
17
-
18
-    <p>
19
-    The Tor network relies on volunteers to donate bandwidth. The more
20
-    people who run relays, the faster the Tor network will be. If you have
21
-    at least 2 megabits/s for both upload and download, please help out
22
-    Tor by configuring your Tor to be a relay too.
23
-    </p>
24
-
25
-    <p>You can run a Tor relay on pretty much any operating system. Tor relays
26
-    work best on current distributions of Linux, FreeBSD, NetBSD, and
27
-    Windows Server.
28
-    </p>
29
-
30
-    <p>
31
-    The best approach for most users is to <a href="<page
32
-    docs/tor-relay-debian>">run your relay on Debian or Ubuntu</a> using
33
-    the system Tor package &mdash; the deb takes care of running Tor as a
34
-    separate user, making sure it has enough file descriptors available,
35
-    starting it at boot, and so on. Tor relays also run nicely on other
36
-    Linux flavors, and on FreeBSD and NetBSD for those who are comfortable
37
-    with those operating systems.
38
-    </p>
39
-
40
-    <hr>
41
-    <a id="torrc"></a>
42
-    <h2><a class="anchor" href="#torrc">Configure Tor by editing the torrc file</a></h2>
43
-    <br />
44
-
45
-    <p>
46
-    Tor's
47
-    configuration file is named 'torrc'.</p>
48
-    <p>Locate the file on your system, open it with a text editor and add the
49
-    following lines:</p>
50
-
51
-    <pre>
52
-    ORPort 443
53
-    Exitpolicy reject *:*
54
-    Nickname ididntedittheconfig
55
-    ContactInfo human@...
56
-    </pre>
57
-
58
-# TODO: Update link to PT setup docs
59
-    <p>If you want to be a bridge, read about the BridgeRelay and
60
-    ServerTransportPlugin values <a
61
-    href="<page docs/pluggable-transports>">on
62
-    this page</a>.</p>
63
-
64
-    <p>Tor will use all your bandwidth if you don't set limits for it. Some
65
-    options are described in <a href="<page docs/faq>#LimitTotalBandwidth">these</a>
66
-    <a href="<page docs/faq>#BandwidthShaping">FAQ entries</a>.</p>
67
-
68
-    <p>See the <a href="https://gitweb.torproject.org/tor.git/plain/src/config/torrc.sample.in">sample
69
-    torrc file</a> and the <a
70
-    href="<page docs/tor-manual>">man
71
-    page</a> for other Tor options you may want to set.</p>
72
-
73
-    <hr>
74
-    <a id="check"></a>
75
-    <h2><a class="anchor" href="#check">Make sure your relay is reachable</a></h2>
76
-    <br>
77
-
78
-    <p>If you are using a firewall, open a hole in your firewall
79
-    so incoming connections can reach the ports you configured
80
-    (ORPort, plus DirPort if you enabled it). If you have a
81
-    hardware firewall (Linksys box, cable modem, etc) you might find <a
82
-    href="http://portforward.com/">portforward.com</a> useful. Also, make sure you
83
-    allow all <em>outgoing</em> connections too, so your relay can reach the
84
-    other Tor relays.
85
-    </p>
86
-
87
-    <p>Restart your relay. If it <a
88
-    href="<page docs/faq>#Logs">logs
89
-    any warnings</a>, address them.
90
-    </p>
91
-
92
-    <p>As soon as your relay manages to connect to the network, it will
93
-    try to determine whether the ports you configured are reachable from
94
-    the outside. This step is usually fast, but may take up to 20
95
-    minutes. Look for a <a href="<page docs/faq>#Logs">log entry</a> like
96
-    <pre>Self-testing indicates your ORPort is reachable from the outside. Excellent.</pre>
97
-    If you don't see this message, it means that your relay is not reachable
98
-    from the outside &mdash; you should re-check your firewalls, check that it's
99
-    testing the IP and port you think it should be testing, etc.
100
-    </p>
101
-
102
-    <p>When your relay has decided that it's reachable, it will upload a "server
103
-    descriptor" to the directories, to let clients know
104
-    what address, ports, keys, etc your relay is using. You can use <a
105
-    href="https://atlas.torproject.org/">Relay Search</a> to lookup
106
-    the nickname you configured, to make sure it's there. You may need to wait
107
-    up to two hours for the directories to publish the new server information
108
-    and for it to be shown on Relay Search.</p>
109
-
110
-    <hr>
111
-    <a id="after"></a>
112
-    <h2><a class="anchor" href="#after">Once your relay is working</a></h2>
113
-    <br>
114
-
115
-    <p>To learn more about the proper care and feeding for your relay,
116
-    see the advice on the <a href=<page docs/tor-relay-debian>#after>Tor
117
-    relay on Debian/Ubuntu</a> page.
118
-    </p>
119
-
120
-    <hr>
121
-
122
-    <p>If you have suggestions for improving this document, please <a
123
-    href="<page about/contact>">send them to us</a>. Thanks
124
-    for helping to make the Tor network grow!</p>
13
+  The Tor Relay documentation moved to the <a href="<wiki>TorRelayGuide">wiki</a>.
125 14
   </div>
126 15
   <!-- END MAINCOL -->
127 16
   <div id = "sidecol">
... ...
@@ -2,15 +2,15 @@
2 2
 # Revision: $Revision$
3 3
 # Translation-Priority: 3-low
4 4
 
5
-#include "head.wmi" TITLE="Tor: Linux/BSD/Unix Install Instructions" CHARSET="UTF-8"
5
+#include "head.wmi" TITLE="Tor: Linux Install Instructions" CHARSET="UTF-8"
6 6
 <div id="content" class="clearfix">
7 7
   <div id="breadcrumbs">
8 8
     <a href="<page index>">Home &raquo; </a>
9 9
     <a href="<page docs/documentation>">Documentation &raquo; </a>
10
-    <a href="<page docs/tor-doc-unix>">Linux/BSD/Unix Client</a>
10
+    <a href="<page docs/tor-doc-unix>">Linux Client</a>
11 11
   </div> 
12 12
   <div id="maincol"> 
13
-    <h1>Running the <a href="<page index>">Tor</a> client on Linux/BSD/Unix</h1>
13
+    <h1>Running the <a href="<page index>">Tor</a> client on Linux</h1>
14 14
     <br>
15 15
     
16 16
     <h2>Note that these are the installation instructions for running a
... ...
@@ -10,181 +10,7 @@
10 10
     <a href="<page docs/tor-doc-relay>">Configure Tor Relay</a>
11 11
   </div>
12 12
   <div id="maincol">
13
-
14
-    <h1>Configuring a Tor relay on Debian/Ubuntu</h1>
15
-
16
-    <hr>
17
-
18
-    <p>
19
-    The Tor network relies on volunteers to donate bandwidth. The more
20
-    people who run relays, the faster the Tor network will be. If you have
21
-    at least 250 kilobytes/s each way, please help out Tor by configuring your
22
-    Tor to be a relay too.
23
-    </p>
24
-
25
-    <hr>
26
-    <a id="zero"></a>
27
-    <a id="install"></a>
28
-    <h2><a class="anchor" href="#install">Step One: Download and Install Tor</a></h2>
29
-    <br>
30
-
31
-    <p>If you're on Debian, start with "apt install tor".</p>
32
-
33
-    <p><b>Do not use the packages in Ubuntu's universe.</b> If you're
34
-    on Ubuntu or if you want to track newer Tor packages, follow the
35
-    <a href="<page docs/debian>#ubuntu">Tor on Ubuntu or Debian</a>
36
-    instructions to use our repository.
37
-    </p>
38
-
39
-    <p>For other Unix/Linux users, you can download Tor from one of our
40
-    <a href="<page download/download-unix>">repositories</a>.</p>
41
-
42
-    <hr>
43
-    <a id="setup"></a>
44
-    <h2><a class="anchor" href="#setup">Step Two: Set it up as a relay</a></h2>
45
-
46
-    <p>
47
-    1. Make sure your clock, date, and timezone are set correctly. Install
48
-    the ntp or openntpd (or similar) package to keep it that way.
49
-    </p>
50
-
51
-    <p>
52
-    2. Edit the bottom part of <a href="<page
53
-    docs/faq>#torrc">/etc/tor/torrc</a>. Define an ORPort. <b>Note
54
-    that public relays default to being <a href="<page
55
-    docs/faq>#ExitPolicies">exit relays</a></b> &mdash; either change your
56
-    ExitPolicy line or read our <a
57
-href="<wiki>/doc/TorExitGuidelines">guidelines
58
-    for exit relay operators</a>. Be sure to set your ContactInfo line
59
-    so we can contact you if you need to upgrade or something goes wrong.
60
-    </p>
61
-
62
-    <p>
63
-    3. If you are using a firewall, open a hole in your firewall
64
-    so incoming connections can reach the ports you configured
65
-    (ORPort, plus DirPort if you enabled it). If you have a
66
-    hardware firewall (Linksys box, cablemodem, etc) you might like <a
67
-    href="http://portforward.com/">portforward.com</a>. Also, make sure you
68
-    allow all <em>outgoing</em> connections too, so your relay can reach the
69
-    other Tor relays.
70
-    </p>
71
-
72
-    <p>
73
-    4. Restart your relay: "systemctl reload tor" (as root).
74
-    </p>
75
-
76
-    <hr>
77
-    <a id="check"></a>
78
-    <h2><a class="anchor" href="#check">Step Three: Make sure it is working</a></h2>
79
-    <br>
80
-
81
-    <p>Once your relay connects to the network, it will
82
-    try to determine whether the ports you configured are reachable from
83
-    the outside. This step is usually fast, but it may take a few minutes.
84
-    Look for a <a href="<page docs/faq>#Logs">log entry</a> in your
85
-    /var/log/tor/log like
86
-    <tt>Self-testing indicates your ORPort is reachable from the outside. Excellent.</tt>
87
-    If you don't see this message, it means that your relay is not reachable
88
-    from the outside &mdash; you should re-check your firewalls, check that it's
89
-    testing the IP and port you think it should be testing, etc.
90
-    </p>
91
-
92
-    <p>When it decides that it's reachable, it will upload a "server
93
-    descriptor" to the directory authorities, to let clients know
94
-    what address, ports, keys, etc your relay is using. After a few
95
-    hours (to give it enough time to propagate), you can query
96
-    <a href="https://atlas.torproject.org/">Relay Search</a> to see whether your
97
-    relay has successfully registered in the network.</p>
98
-
99
-    <hr>
100
-    <a id="after"></a>
101
-    <h2><a class="anchor" href="#after">Step Four: Once it is working</a></h2>
102
-    <br>
103
-
104
-    <p>
105
-    5. Read
106
-    <a href="<wiki>doc/OperationalSecurity">about operational security</a>
107
-    to get ideas how you can increase the security of your computer.
108
-    </p>
109
-
110
-    <p>
111
-    6. Decide about rate limiting. Cable modem, DSL, and other users
112
-    who have asymmetric bandwidth (e.g. more down than up) should
113
-    rate limit to their slower bandwidth, to avoid congestion. See the <a
114
-    href="<page docs/faq>#BandwidthShaping">rate
115
-    limiting FAQ entry</a> for details.
116
-    </p>
117
-
118
-    <p>
119
-    7. If your computer isn't running a webserver, and you haven't set
120
-    AccountingMax, please consider
121
-    changing your ORPort to 443 and/or your DirPort to 80. Many Tor users
122
-    are stuck behind firewalls that only let them browse the web, and
123
-    this change will let them reach your Tor relay. If you are already
124
-    using ports 80 and 443, other useful ports are 22, 110, and 143.
125
-    </p>
126
-
127
-    <p>
128
-    8. Consider backing up your Tor relay's private keys
129
-    ("/var/lib/tor/keys/secret_id_key" and
130
-    "/var/lib/tor/keys/ed25519_master_id_secret_key").
131
-    You'll need these identity keys to
132
-    <a href="<page docs/faq>#UpgradeOrMove">move or restore your Tor relay</a>.
133
-    </p>
134
-
135
-    <p>
136
-    9. If you run an exit relay (great!), don't miss out on our <a
137
-    href="<wiki>doc/TorExitGuidelines">Exit Guidelines</a>, including
138
-    setting your reverse DNS hostname to make it obvious that you're
139
-    a Tor exit relay, and serving the <a
140
-    href="<gitblob>contrib/operator-tools/tor-exit-notice.html">Tor
141
-    exit notice</a> page on your DirPort.
142
-    </p>
143
-
144
-    <p>
145
-    10. Subscribe to the <a
146
-    href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-announce">tor-announce</a>
147
-    mailing list. It is very low volume, and it will keep you informed
148
-    of new stable releases.
149
-    As a relay operator, you should consider subscribing to the
150
-    <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays">
151
-    tor-relays mailing list</a> too.
152
-    We have more <a href="<page docs/documentation>#MailingLists">mailing
153
-    lists</a> as well.
154
-    </p>
155
-
156
-    <p>
157
-    11. Read the <a 
158
-    href="https://blog.torproject.org/blog/lifecycle-of-a-new-relay">"Lifecycle 
159
-    of a New Relay"</a> document to learn what sort of activity and usage 
160
-    patterns you can expect during your relay's first weeks of operation.
161
-    </p>
162
-
163
-    <p>
164
-    12. If you want to run more than one relay that's great, but please set <a
165
-    href="<page docs/faq>#MultipleRelays">the
166
-    MyFamily option</a> in all your relays' configuration files.
167
-    </p>
168
-
169
-    <p>
170
-    13. You might like to use the <a
171
-    href="https://nyx.torproject.org/">Nyx</a> relay monitor to watch
172
-    your relay's activities from the command line. First, "sudo pip install
173
-    nyx". Second, as the user that will be running nyx, run
174
-    "sudo adduser $USER debian-tor" to add your user to the debian-tor
175
-    group so it can reach Tor's controlsocket. Then log out and log back
176
-    in (so your user is actually in the group), and run "nyx".
177
-    </p>
178
-
179
-    <p>
180
-    14. When you change your Tor configuration, remember to verify that
181
-    your relay still works correctly after the change.
182
-    </p>
183
-
184
-    <hr>
185
-
186
-    <p>If you have suggestions for improving this document, please <a
187
-    href="<page about/contact>">send them to us</a>. Thanks!</p>
13
+  The Tor Relay documentation moved to the <a href="<wiki>TorRelayGuide">wiki</a>.
188 14
   </div>
189 15
   <!-- END MAINCOL -->
190 16
   <div id = "sidecol">
... ...
@@ -297,7 +297,7 @@
297 297
     <p>Starting with Tor Browser 4.5a4 we sign our MAR files which helps
298 298
     securing our update process. The downside of this is the need for additional
299 299
     instructions to verify that the MAR files we ship are indeed the ones we
300
-    produced with our Gitian setup.</p>
300
+    produced with our rbm setup.</p>
301 301
 
302 302
     <p>Assuming the verification happens on a Linux computer one first needs the
303 303
     <tt>mar-tools-linux*.zip</tt> out of the <tt>gitian-builder/inputs</tt>
... ...
@@ -31,7 +31,7 @@ form#makeDonation {
31 31
    <div class="hundred toptwenty">
32 32
     <div class="dbox donate">
33 33
     <h3>Donate Bitcoin</h3>
34
-<p>To donate Bitcoin to The Tor Project, please complete the form below. If you would like an acknowledgment from the Tor Project, please provide your email address. (Due to the current state of the Bitcoin market, our payment processor, Bitpay, will not allow us to accept donations of less than 100 USD. However, we can also accept donations, including smaller donations, through Bitcoin Cash. Send us a tip with <a href="https://twitter.com/tipprbot">@tipprbot</a> on Twitter!)</p>
34
+<p>To donate Bitcoin to The Tor Project, please complete the form below. If you would like an acknowledgment from the Tor Project, please provide your email address. (Due to the current state of the Bitcoin market, our payment processor, Bitpay, will not allow us to accept donations of less than 5 USD. However, we can also accept donations, including smaller donations, through Bitcoin Cash. Send us a tip with <a href="https://twitter.com/tipprbot">@tipprbot</a> on Twitter!)</p>
35 35
   <form id="makeDonation" action="https://bitpay.com/checkout" method="post" onsubmit="return bp.validateMobileCheckoutForm($('#makeDonation'));">
36 36
         <input name="action" type="hidden" value="checkout">
37 37
         <fieldset class="phone-form well form-horizontal" style="margin-top: 5px;">
... ...
@@ -42,7 +42,7 @@ form#makeDonation {
42 42
             </li>
43 43
             <li id="price" class="control-group">
44 44
                 <label class="control-label" style="width: 80px">Amount:</label>
45
-                <input name="price" type="number" class="noscroll" value="100.00" placeholder="Amount" maxlength="10" min="100" step="0.01" />
45
+                <input name="price" type="number" class="noscroll" value="20" placeholder="Amount" maxlength="10" min="1" step="0.01" />
46 46
                 <select name="currency" value="" >
47 47
                   <option value="USD" selected="selected">USD</option>
48 48
                   <option value="BTC">BTC</option>
... ...
@@ -119,6 +119,25 @@
119 119
 	  <p class="alt-dl">Not Using Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p>
120 120
 	</div>
121 121
       </div>
122
+<!-- START BSD -->
123
+
124
+  <div id="openbsd" class="easy bsd">
125
+    <div class="package" style="padding-top: 13px; border-top: 0px;">
126
+      <div class="desc">
127
+        <h2>Running Tor on OpenBSD</h2>
128
+	<p>These are installation instructions for running Tor Browser in a OpenBSD environment.</p>
129
+	<p>To install from OpenBSD's packages, run:</p>
130
+
131
+
132
+        <pre>pkg_add tor-browser</pre>
133
+
134
+   
135
+        <p>To install the Tor Browser port from an updated ports tree, run:</p>
136
+
137
+        <pre>cd /usr/ports/meta/tor-browser && make install</pre>
138
+      </div>
139
+    </div>
140
+  </div>
122 141
 <!-- START Orbot -->
123 142
       <div id="android" class="easy android">
124 143
     <div class="package" style="padding-top: 13px; border-top: 0px;">
... ...
@@ -268,6 +287,7 @@ are blocked.</p>
268 287
 <li class="dropdown"><a href="#windows">Microsoft Windows</a></li>
269 288
 <li class="dropdown"><a href="#mac">Apple OS X</a></li>
270 289
 <li class="dropdown"><a href="#linux">Linux</a></li>
290
+<li class="dropdown"><a href="#openbsd">OpenBSD</a></li>
271 291
 <li class="dropdown"><a href="#android">Android</a></li>
272 292
 <li class="dropdown"><a href="<page download/download>">All Downloads</a></li>
273 293
 </ul>
... ...
@@ -2,7 +2,7 @@
2 2
 # Revision: $Revision$
3 3
 # Translation-Priority: 1-high
4 4
 
5
-#include "head.wmi" TITLE="Tor Project | Privacy Online" CHARSET="UTF-8" DONATION_BANNER="true"
5
+#include "head.wmi" TITLE="Tor Project | Privacy Online" CHARSET="UTF-8"
6 6
 
7 7
 
8 8
 <div id="home">
... ...
@@ -14,7 +14,7 @@
14 14
     <hr>
15 15
 
16 16
     <p>You can get one of these fine Tor T-shirts for contributing to the
17
-    Tor project. There are three primary ways of contributing:</p>
17
+    Tor project. There are two primary ways of contributing:</p>
18 18
 
19 19
     <ol>
20 20
     <li>Operate a fast <a href="<page docs/tor-doc-relay>">Tor relay</a>
21 21
deleted file mode 100644
22 22
Binary files a/images/onion-hand.png and /dev/null differ
23 23
deleted file mode 100644
24 24
Binary files a/images/people/bparker.png and /dev/null differ
... ...
@@ -33,7 +33,6 @@
33 33
    # begin WML to generate css/js paths
34 34
    <ifneq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/$(STYLESHEET)" rel="stylesheet">">
35 35
    <ifeq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/css/master.min.css" rel="stylesheet">">
36
-   <ifeq "$(DONATION_BANNER)" "true" "<link href="$(DOCROOT)/css/donation-banner.css" rel="stylesheet">">
37 36
 
38 37
    #<link href="css/master.min.css" rel="stylesheet">
39 38
    <!--[if lte IE 8]>
... ...
@@ -49,24 +48,6 @@
49 48
    # end WML to generate css/js paths
50 49
 </head>
51 50
 <body>
52
-<!-- Insert donation banner if flag is true -->
53
-<ifeq "$(DONATION_BANNER)" "true" "
54
-    <div id="banner-wrapper">
55
-        <div id="banner-contents-container">
56
-            <div id="banner-tagline"><span><noscript>Protecting the Privacy of Millions Every Day</noscript></span></div>
57
-            <div id="banner-slogan"><span>Tor: Powering Digital Resistance</span></div>
58
-            <a id="banner-donate-button-link"
59
-               href="https://www.torproject.org/donate/donate-pdr-hp">
60
-                <div id="banner-donate-button">
61
-                    <span>Donate Now!&#160;&#9654;</span>
62
-                </div>
63
-            </a>
64
-        </div>
65
-    </div>
66
-    <div id="banner-spacer"></div>
67
-    <script src="js/donation_banner.js"></script>
68
-
69
-">
70 51
 <div id="wrap">
71 52
   <div id="header">
72 53
     <h1 id="logo"><a href="<page index>">Tor</a></h1>
... ...
@@ -1,12 +1,12 @@
1 1
 <define-tag version-stable whitespace=delete>0.3.2.9</define-tag>
2
-<!-- <define-tag version-alpha whitespace=delete>0.3.2.8-rc</define-tag> -->
2
+<define-tag version-alpha whitespace=delete>0.3.3.1-alpha</define-tag>
3 3
 
4
-<define-tag version-torbrowserdevelopbranch whitespace=delete>maint-7.0</define-tag>
4
+<define-tag version-torbrowserdevelopbranch whitespace=delete>maint-7.5</define-tag>
5 5
 
6 6
 # *** tor browser stable ***
7
-<define-tag version-torbrowserbundle-all whitespace=delete>7.0.11</define-tag>
8
-<define-tag releasedate-torbrowserbundle-all whitespace=delete>2017-12-09</define-tag>
9
-<define-tag version-win32-stable whitespace=delete>0.3.1.9</define-tag>
7
+<define-tag version-torbrowserbundle-all whitespace=delete>7.5</define-tag>
8
+<define-tag releasedate-torbrowserbundle-all whitespace=delete>2018-01-23</define-tag>
9
+<define-tag version-win32-stable whitespace=delete>0.3.2.9</define-tag>
10 10
 
11 11
 # If all platforms are on the same version, you only to update
12 12
 # version-torbrowserbundle-all and releasedate-torbrowserbundle-all
... ...
@@ -22,8 +22,8 @@
22 22
 <define-tag package-win32-stable whitespace=delete>../dist/torbrowser/<version-torbrowserbundle>/tor-win32-<version-win32-stable>.zip</define-tag>
23 23
 
24 24
 # *** tor browser beta/alpha ***
25
-<define-tag version-torbrowserbundlebeta-all whitespace=delete>7.5a10</define-tag>
26
-<define-tag releasedate-torbrowserbundlebeta-all whitespace=delete>2017-12-20</define-tag>
25
+<define-tag version-torbrowserbundlebeta-all whitespace=delete>8.0a1</define-tag>
26
+<define-tag releasedate-torbrowserbundlebeta-all whitespace=delete>2018-01-24</define-tag>
27 27
 <define-tag version-torbrowsersandboxlinux whitespace=delete>0.0.16</define-tag>
28 28
 
29 29
 # If all platforms are on the same version, you only need to update
... ...
@@ -16,7 +16,7 @@ function OScheck() {
16 16
   }else if(clientos == "Windows"){
17 17
     $('.easy.windows').css('display', 'block');
18 18
   }else if(clientos == "Mac"){
19
-    $('.easy.mac').css('display', 'block');
19
+      $('.easy.mac').css('display', 'block');
20 20
   }else if(clientos == "Android"){
21 21
     $('.easy.android').css('display', 'block');
22 22
   }else{
... ...
@@ -92,7 +92,7 @@ $(document).ready(function () {
92 92
       var url = $.param.fragment();
93 93
 
94 94
       // Toggle the '.easy' divs to off
95
-      if(url == 'windows'|url == 'mac'|url == 'linux'|url == 'android'){
95
+      if(url == 'windows'|url == 'mac'|url == 'linux'|url == 'openbsd'|url == 'android'){
96 96
 
97 97
 	  $('.easy').css('display', 'none');
98 98
       }
... ...
@@ -102,7 +102,9 @@ $(document).ready(function () {
102 102
       } else if(url == 'mac'){
103 103
 	$('.easy.mac').css('display', 'block');
104 104
       } else if(url == 'linux'){
105
-	$('.easy.linux').css('display', 'block');
105
+	  $('.easy.linux').css('display', 'block');
106
+      } else if(url == 'openbsd'){
107
+	$('.easy.bsd').css('display', 'block');
106 108
       } else if(url == 'android'){
107 109
   $('.easy.android').css('display', 'block');
108 110
       } else {
109 111
deleted file mode 100644
... ...
@@ -1,33 +0,0 @@
1
-/* jshint esnext:true */
2
-
3
-let kTaglines = [
4
-  "Protecting Journalists, Whistleblowers, & Activists Since 2006",
5
-  "Networking Freedom Worldwide",
6
-  "Freedom Online",
7
-  "Fostering Free Expression Worldwide",
8
-  "Protecting the Privacy of Millions Every Day",
9
-];
10
-
11
-let kTaglineSizes = [
12
-  30,
13
-  40,
14
-  48,
15
-  36,
16
-  36,
17
-];
18
-
19
-// Returns a random integer x, such that 0 <= x < max
20
-let randomInteger = function (max) {
21
-  return Math.floor(max * Math.random());
22
-};
23
-
24
-// The main donation banner function.
25
-let runDonationBanner = function () {
26
-  // Load random tag line once page is loaded
27
-  let index = randomInteger(kTaglines.length);
28
-  let taglineElement = document.querySelector("#banner-tagline span");
29
-  taglineElement.innerText = kTaglines[index];
30
-  taglineElement.style.fontSize = kTaglineSizes[index] + "px";
31
-};
32
-
33
-runDonationBanner();
34 0
deleted file mode 100644
... ...
@@ -1,63 +0,0 @@
1
-
2
-mQINBFgrYUQBEAC5ujergWyBeLWy1jdJXgBD4yRxq5zhWYKlQh3w5zbFfTht4+4+
3
-L7GR0i3+J7INQ6yWs2dywaodf/WngO+tiCJdoDjjllExgIqtJmwZ5kRuAvYHGEWC
4
-RS6cvWs+iTHZEH4D3tT4uORP8hWVoQiYSs5JIZ0Xzmy+AtZxJeLMhMxvSq4/7hi+
5
-08WPnqUkkB/3T+eo1+bBn88OzEZc6o1Jqy7vvdHvbSdSHmYoOYVMAI0QfltlTmIf
6
-2x498hlXy27Jo8Vg1W4cz0CCh/1uBQxJRflcwhEyG1u3QVinR1UlUQtP2jE7LnGJ
7
-qtoMqzLUlRpPRApMMx8RhkIvocmxv3uh1G8iZU25BZ/wYogATMjIX7RDfYvKN0iM
8
-xhj4C9NM23F0CfJSCG1HaWkdTIQ9tfSaN/SwqQb970GD0CgKFosxcda3BoH8gcNN
9
-y5yTqFhnIiWqEiFrQgEwSuKT77P2McqeK6LX5N9WkHks1SZYl+3BSaXBiJYuhtTt
10
-AkN8aTX61qElCncJdFkmI5LBgWYa0XYYSIpuPUWZBLAW4siEEKS5uVeHEtPBkwa8
11
-mTgMlKCS/Xd3pbc2MJTpVWM6d9sYeplGcF+djUXii67otABNKLM9I6dpJRPRWkq2
12
-kL+2/kKd6HKSPjiC9zcFWbCbEqBywWY/fRleJMQfbGJ5tzefzMhz5xsRCwARAQAB
13
-tB9CcmFkIFBhcmtlciA8YnBhcmt0cEBnbWFpbC5jb20+iQI3BBMBCgAhBQJYK2FE
14
-AhsjBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJEDeLoZLH4HXU4ykQAKNVS+m8
15
-sz30nPUTwHmsUJYzf8Z9q+WHjTyRJakPjWJ7DtkalOMlpMasBbl+zGMsGMY1wOJJ
16
-dsqRrONKFY2kn6IoPfL8Zsi9K1AOruD4VduzPrq3fVkUjMwVhg+T4qLdAOoKzzZV
17
-lQBFoMMVBuUTUkfUM0XL0oLNoZ+9IgIsz2SrknTsOmU/ooFZe0wXIdF4xjqr7nGa
18
-flLgIfz/4gjicQhCFEmlRbuG+jFizun8HkYQTFhPEsO2CP7UeqhbRixLuRYOHNmH
19
-YGfjPIe8GUj8ma/N/giNXFhpf4fskpQNgw+lVyCrVPngfpAX8c5PCig+ALRCj+X+
20
-U/34dxOon2r3dw1z0+x7zXFesLOiteCKKbCIbP+ErAFxhb1f5SJpa7KUqvEYv6zr
21
-J/Gtv2XMeZmVg9Fg2X3JwizGsJBWwGK/AETpfySiObIhe5DxCL0Uo8438HE6QJTd
22
-O4D6QFETuSHB9T9l0wVT3cmv6XA9QX+HATCZh1vTN//bvJ4cSH7ZsQJd3qFPpe9F
23
-Cx2s2MoZbIt5EDqS4kYfpc8osZmHtVpOWKqql/39uh/NL+C4mOsu42f5Bx4KNwNn
24
-AbyyF2dse6BsAd9Zw4QjxT2J/Ni09vcqzIIfhm1ZNTZ5KN77u+dyFSh3u0F69oNy
25
-qWxSZNA0SqYuzBxXGvz0YRcI29awMQUH4N9KtCFCcmFkIFBhcmtlciA8YnJhZEB0
26
-b3Jwcm9qZWN0Lm9yZz6JAjcEEwEKACEFAlguMcACGyMFCwkIBwMFFQoJCAsFFgID
27
-AQACHgECF4AACgkQN4uhksfgddQNkxAAn/+jwbYAUnbikfT3GQ/58Yfj6EuLyWqK
28
-fB8VfIvQ5zAuuif1CxvyCurbh7ipABETrHGZRJ/Fmudq4F0cswN8fcPdRvkKS4YO
29
-smCJSnvRYBbzlaI39mlAq0NQElkDwsu7gzkSdUBiFkAvYd8ZJj94Xyh/v+fbE1kd
30
-OrqBq9FtUERxucVsaXhdddxfI+QLckYYddun1P65TjXSFZR6EEIrAnWMrSBlcdA6
31
-a+nfoi9sRVIL/Qg8KcyPTb7IwUIP7rcSE9X5Fy2Mk7MLhi8sobzmJc6pPSuirYHC
32
-ZerhgwiVvFTSiXjpBifAxVVgDZou4tFFn1ViZ/9G+j+nXnBgP2gE8cbMfd7gLyUG
33
-24opz53JzrWKUYupHh/GawCv7DDlizzMaKOXGXjPHLmHHUmZA8MY4n6cRCOOo7Kj
34
-iT2CPFivICKS/QcjFRD4bOGSYbpIveiCQIKlYvhVo/rMSRlX1imFWdEImi6SmmmT
35
-4NWPhctfL0dETkU6twLIE9k3YgtbCHVvDqUcLHEJREEJIvo87p2CVq0w+nbEtyEx
36
-zHGk5HwYVJmZwA75X1m9QkvIMsLeS5xZbcEDABgdYzVvYXOHkpNFWWZDBuP+dIDL
37
-qUaHeWWvEpcVq7ajigygYSUyG8wjtZPxYhCwKeMz1dg2PCWJmnqietyajK9lxrG5
38
-6MripBC5d7S5Ag0EWCthRAEQAMDCZSphf/poLQuHhkaA0tPH2fmYuFZG5RUbQicW
39
-pfl2W2nHntgR7baasWX4xXbcL1kjBnumwY8mdl2/+Vtgdv8zW5XClL8V8Fd9kZZu
40
-nu26T4ttLl7E2Pnj5oRSF80AQXDR6LLgiP5KjBaUfwrkuuqFCKHCpsA4Q3xVtSoj
41
-/9FnaRX8E+cih9PNas+OaU8SRRJOvmLjOiDbJrb/ZeHtFVF59roe4hjCrw1Q5js/
42
-5c+hkSXbjnKlNqEbSC/pq5GtUniiXxoomvFBAAluHO5y7EUwpfVpF7P1oRTrFRk2
43
-V+9QwUhniZ9KPRLhFoBnQNWSjECow6i1aTKnAMePDmXT5glRb8rgje6U2XePqHG7
44
-z2xM5fAYfoliLmB7mH4lTNQmRAe+iF6kGEVfpxcGOKb5iJFoPQFMXnkisqVrfLZX
45
-zrrl4BfcbJlPc8o0Y5djT2hZ0K05Xtqe+sa0VQC1TnWylqdMnUWRyj3OYTNLgL03
46
-vFt34l0ntbLdC8612mxyFFg1TgNO7iFkc19G3iQIhvOJHt6NDoIbEjDJUWlkZZMe
47
-/EWxyIzxDmkg+dpYg7xhwTM5tM4IBy/Mc5d9Vug8671UpK0sh6/AezR1dLqw9n2w
48
-zFChLvSFXD7U05l62ND5q6GsfA81pgDn4u29F6/j0pCquIEkbZPwNVR0tqtzCiVf
49
-OhltABEBAAGJAh8EGAEKAAkFAlgrYUQCGwwACgkQN4uhksfgddSpWBAAtcPAbi4k
50
-YB15dbGKa4FXVAzRqhRjWOap01ORNELOWzUgcpzO+CVZPVDhIhzfxs16Yi0ZHmEv
51
-iYshji0g3NtuYpAD8tK+vFtZxzACXpgsOb3jsbeOOc1XKucUrMdDPz1litL394T3
52
-+Qp+MORAHmuEAg2HJdHyrI96ODDGgvg9zjjgM+uccWffu/XgqOZVKRY6ZXf9nIKr
53
-OlV+xHrkyBN3OCplJB22NfMMEwuxkBHhWa0pFt6Qcxrd0cS/glh9dqqt90XFNBWj
54
-bds60hDHMjTPnTlaDUBH2dCzTyGgVWdLfNm4oxdsV00102n4lVwrtHEDS8vH9zAp
55
-ERnTzILw51eTZrIb8QX11tGovTPCYYqVeozagoY7eaFFpwAyqJMB5IO/b4V0h/5m
56
-HoQfu81ZsUi1WyEfM9OeYDPleSRMSpkNK6Yv9uROgaUdg5S2cw/pEtZK8JXdSyTu
57
-1S4J/Hwa+kg1rnEQ/kVK1bsXfPr/zvWo/WP0bQa+5+YMnKwyW/rmLlaNfqAUyxpU
58
-LmtAcM4c1lOB6U+m88UVMIz4ONfKf89J2PbGd+NGqK00CRLqgb3jHeQuZDRsk4DU
59
-AITZYVy4r6NK79HB6QwXKOxrbh3SoFcTAaH0/ibjt+4EupU7/ofpMVX32DHMqHC0
60
-ztE1m+MhSMTnM3TWORTtSgcf1YKCGTF8Djs=
61
-=sl6W
... ...
@@ -50,6 +50,18 @@ some of the significant Tor-related stories that have popped up.</p>
50 50
 </tr>
51 51
 </thead>
52 52
 
53
+<tr style="background-color: #e5e5e5;">
54
+<td>2017 Dec 10</td>
55
+<td>BoingBoing</td>
56
+<td><a href="https://boingboing.net/2017/12/10/charitable-giving-guide-2017.html">Charitable Giving Guide 2017</a></td>
57
+</tr>
58
+
59
+<tr style="">
60
+<td>2017 Dec 9</td>
61
+<td>WIRED</td>
62
+<td><a href="https://www.wired.com/story/the-grand-tor">The Grand Tor: How to Go Anonymous Online</a></td>
63
+</tr>
64
+
53 65
 <tr style="background-color: #e5e5e5;">
54 66
 <td>2017 Nov 20</td>
55 67
 <td>Bleeping Computer</td>
... ...
@@ -740,19 +740,18 @@
740 740
       <a
741 741
       href="https://www.torproject.org/projects/torbrowser/design/">design
742 742
       document</a>, the <a
743
-      href="https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/Bundle-Data/Docs/ChangeLog.txt?h=<version-torbrowserdevelopbranch>">ChangeLog
743
+      href="https://gitweb.torproject.org/builders/tor-browser-build.git/tree/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=<version-torbrowserdevelopbranch>">ChangeLog
744 744
       for the branch <version-torbrowserdevelopbranch></a>, and the <a
745
-      href="https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/Bundle-Data/Docs/ChangeLog.txt">ChangeLog
745
+      href="https://gitweb.torproject.org/builders/tor-browser-build.git/tree/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt">ChangeLog
746 746
       for the alpha branch</a>.
747 747
       </p>
748 748
       <p><strong><em>How can I make my own bundle?</em></strong>
749
-<br>We use <a
750
-href="https://blog.torproject.org/blog/deterministic-builds-part-two-technical-details">Gitian</a>
749
+<br>We use <a href="https://rbm.torproject.org/">rbm</a>
751 750
 to ensure that byte-for-byte reproducible packages can be built from our
752 751
 source repository by anyone. To rebuild the bundle, check out the <a
753
-href="https://gitweb.torproject.org/builders/tor-browser-bundle.git">Tor
752
+href="https://gitweb.torproject.org/builders/tor-browser-build.git">Tor
754 753
 Browser builder repository</a> and see the <a
755
-href="https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/gitian/README.build">README.build</a>
754
+href="https://gitweb.torproject.org/builders/tor-browser-build.git/tree/README">README</a>
756 755
 for instructions. You may also find the <a
757 756
 href="https://trac.torproject.org/projects/tor/wiki/doc/TorBrowser/Hacking">Tor
758 757
 Browser Hacking</a> intro document useful for learning about the build system
... ...
@@ -1,14 +1,10 @@
1 1
 [
2
-"7.0.11",
3
-"7.0.11-MacOS",
4
-"7.0.11-Linux",
5
-"7.0.11-Windows",
6
-"7.5a9",
7
-"7.5a9-MacOS",
8
-"7.5a9-Linux",
9
-"7.5a9-Windows",
10
-"7.5a10",
11
-"7.5a10-MacOS",
12
-"7.5a10-Linux",
13
-"7.5a10-Windows"
2
+"7.5",
3
+"7.5-MacOS",
4
+"7.5-Linux",
5
+"7.5-Windows",
6
+"8.0a1",
7
+"8.0a1-MacOS",
8
+"8.0a1-Linux",
9
+"8.0a1-Windows"
14 10
 ]
... ...
@@ -1,9 +1,9 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>The Design and Implementation of the Tor Browser [DRAFT]</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /></head><body><div class="article"><div class="titlepage"><div><div><h2 class="title"><a id="design"></a>The Design and Implementation of the Tor Browser [DRAFT]</h2></div><div><div class="author"><h3 class="author"><span class="firstname">Mike</span> <span class="surname">Perry</span></h3><div class="affiliation"><div class="address"><p><code class="email">&lt;<a class="email" href="mailto:mikeperry#torproject org">mikeperry#torproject org</a>&gt;</code></p></div></div></div></div><div><div class="author"><h3 class="author"><span class="firstname">Erinn</span> <span class="surname">Clark</span></h3><div class="affiliation"><div class="address"><p><code class="email">&lt;<a class="email" href="mailto:erinn#torproject org">erinn#torproject org</a>&gt;</code></p></div></div></div></div><div><div class="author"><h3 class="author"><span class="firstname">Steven</span> <span class="surname">Murdoch</span></h3><div class="affiliation"><div class="address"><p><code class="email">&lt;<a class="email" href="mailto:sjmurdoch#torproject org">sjmurdoch#torproject org</a>&gt;</code></p></div></div></div></div><div><div class="author"><h3 class="author"><span class="firstname">Georg</span> <span class="surname">Koppen</span></h3><div class="affiliation"><div class="address"><p><code class="email">&lt;<a class="email" href="mailto:gk#torproject org">gk#torproject org</a>&gt;</code></p></div></div></div></div><div><p class="pubdate">March 10th, 2017</p></div></div><hr /></div><div class="toc"><p><strong>Table of Contents</strong></p><dl class="toc"><dt><span class="sect1"><a href="#idm29">1. Introduction</a></span></dt><dd><dl><dt><span class="sect2"><a href="#components">1.1. Browser Component Overview</a></span></dt></dl></dd><dt><span class="sect1"><a href="#DesignRequirements">2. Design Requirements and Philosophy</a></span></dt><dd><dl><dt><span class="sect2"><a href="#security">2.1. Security Requirements</a></span></dt><dt><span class="sect2"><a href="#privacy">2.2. Privacy Requirements</a></span></dt><dt><span class="sect2"><a href="#philosophy">2.3. Philosophy</a></span></dt></dl></dd><dt><span class="sect1"><a href="#adversary">3. Adversary Model</a></span></dt><dd><dl><dt><span class="sect2"><a href="#adversary-goals">3.1. Adversary Goals</a></span></dt><dt><span class="sect2"><a href="#adversary-positioning">3.2. Adversary Capabilities - Positioning</a></span></dt><dt><span class="sect2"><a href="#attacks">3.3. Adversary Capabilities - Attacks</a></span></dt></dl></dd><dt><span class="sect1"><a href="#Implementation">4. Implementation</a></span></dt><dd><dl><dt><span class="sect2"><a href="#proxy-obedience">4.1. Proxy Obedience</a></span></dt><dt><span class="sect2"><a href="#state-separation">4.2. State Separation</a></span></dt><dt><span class="sect2"><a href="#disk-avoidance">4.3. Disk Avoidance</a></span></dt><dt><span class="sect2"><a href="#app-data-isolation">4.4. Application Data Isolation</a></span></dt><dt><span class="sect2"><a href="#identifier-linkability">4.5. Cross-Origin Identifier Unlinkability</a></span></dt><dt><span class="sect2"><a href="#fingerprinting-linkability">4.6. Cross-Origin Fingerprinting Unlinkability</a></span></dt><dt><span class="sect2"><a href="#new-identity">4.7. Long-Term Unlinkability via "New Identity" button</a></span></dt><dt><span class="sect2"><a href="#other-security">4.8. Other Security Measures</a></span></dt></dl></dd><dt><span class="sect1"><a href="#BuildSecurity">5. Build Security and Package Integrity</a></span></dt><dd><dl><dt><span class="sect2"><a href="#idm1010">5.1. Achieving Binary Reproducibility</a></span></dt><dt><span class="sect2"><a href="#idm1042">5.2. Package Signatures and Verification</a></span></dt><dt><span class="sect2"><a href="#idm1049">5.3. Anonymous Verification</a></span></dt><dt><span class="sect2"><a href="#update-safety">5.4. Update Safety</a></span></dt></dl></dd><dt><span class="appendix"><a href="#Transparency">A. Towards Transparency in Navigation Tracking</a></span></dt><dd><dl><dt><span class="sect1"><a href="#deprecate">A.1. Deprecation Wishlist</a></span></dt><dt><span class="sect1"><a href="#idm1090">A.2. Promising Standards</a></span></dt></dl></dd></dl></div><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="idm29"></a>1. Introduction</h2></div></div></div><p>
2
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>The Design and Implementation of the Tor Browser [DRAFT]</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /></head><body><div class="article"><div class="titlepage"><div><div><h2 class="title"><a id="design"></a>The Design and Implementation of the Tor Browser [DRAFT]</h2></div><div><div class="author"><h3 class="author"><span class="firstname">Mike</span> <span class="surname">Perry</span></h3><div class="affiliation"><div class="address"><p><code class="email">&lt;<a class="email" href="mailto:mikeperry#torproject org">mikeperry#torproject org</a>&gt;</code></p></div></div></div></div><div><div class="author"><h3 class="author"><span class="firstname">Erinn</span> <span class="surname">Clark</span></h3><div class="affiliation"><div class="address"><p><code class="email">&lt;<a class="email" href="mailto:erinn#torproject org">erinn#torproject org</a>&gt;</code></p></div></div></div></div><div><div class="author"><h3 class="author"><span class="firstname">Steven</span> <span class="surname">Murdoch</span></h3><div class="affiliation"><div class="address"><p><code class="email">&lt;<a class="email" href="mailto:sjmurdoch#torproject org">sjmurdoch#torproject org</a>&gt;</code></p></div></div></div></div><div><div class="author"><h3 class="author"><span class="firstname">Georg</span> <span class="surname">Koppen</span></h3><div class="affiliation"><div class="address"><p><code class="email">&lt;<a class="email" href="mailto:gk#torproject org">gk#torproject org</a>&gt;</code></p></div></div></div></div><div><p class="pubdate">January 25th, 2018</p></div></div><hr /></div><div class="toc"><p><strong>Table of Contents</strong></p><dl class="toc"><dt><span class="sect1"><a href="#idm29">1. Introduction</a></span></dt><dd><dl><dt><span class="sect2"><a href="#components">1.1. Browser Component Overview</a></span></dt></dl></dd><dt><span class="sect1"><a href="#DesignRequirements">2. Design Requirements and Philosophy</a></span></dt><dd><dl><dt><span class="sect2"><a href="#security">2.1. Security Requirements</a></span></dt><dt><span class="sect2"><a href="#privacy">2.2. Privacy Requirements</a></span></dt><dt><span class="sect2"><a href="#philosophy">2.3. Philosophy</a></span></dt></dl></dd><dt><span class="sect1"><a href="#adversary">3. Adversary Model</a></span></dt><dd><dl><dt><span class="sect2"><a href="#adversary-goals">3.1. Adversary Goals</a></span></dt><dt><span class="sect2"><a href="#adversary-positioning">3.2. Adversary Capabilities - Positioning</a></span></dt><dt><span class="sect2"><a href="#attacks">3.3. Adversary Capabilities - Attacks</a></span></dt></dl></dd><dt><span class="sect1"><a href="#Implementation">4. Implementation</a></span></dt><dd><dl><dt><span class="sect2"><a href="#proxy-obedience">4.1. Proxy Obedience</a></span></dt><dt><span class="sect2"><a href="#state-separation">4.2. State Separation</a></span></dt><dt><span class="sect2"><a href="#disk-avoidance">4.3. Disk Avoidance</a></span></dt><dt><span class="sect2"><a href="#app-data-isolation">4.4. Application Data Isolation</a></span></dt><dt><span class="sect2"><a href="#identifier-linkability">4.5. Cross-Origin Identifier Unlinkability</a></span></dt><dt><span class="sect2"><a href="#fingerprinting-linkability">4.6. Cross-Origin Fingerprinting Unlinkability</a></span></dt><dt><span class="sect2"><a href="#new-identity">4.7. Long-Term Unlinkability via "New Identity" button</a></span></dt><dt><span class="sect2"><a href="#other-security">4.8. Other Security Measures</a></span></dt></dl></dd><dt><span class="sect1"><a href="#BuildSecurity">5. Build Security and Package Integrity</a></span></dt><dd><dl><dt><span class="sect2"><a href="#idm1144">5.1. Achieving Binary Reproducibility</a></span></dt><dt><span class="sect2"><a href="#idm1176">5.2. Package Signatures and Verification</a></span></dt><dt><span class="sect2"><a href="#idm1183">5.3. Anonymous Verification</a></span></dt><dt><span class="sect2"><a href="#update-safety">5.4. Update Safety</a></span></dt></dl></dd><dt><span class="appendix"><a href="#Transparency">A. Towards Transparency in Navigation Tracking</a></span></dt><dd><dl><dt><span class="sect1"><a href="#deprecate">A.1. Deprecation Wishlist</a></span></dt><dt><span class="sect1"><a href="#idm1226">A.2. Promising Standards</a></span></dt></dl></dd></dl></div><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="idm29"></a>1. Introduction</h2></div></div></div><p>
3 3
 
4 4
 This document describes the <a class="link" href="#adversary" title="3. Adversary Model">adversary model</a>,
5 5
 <a class="link" href="#DesignRequirements" title="2. Design Requirements and Philosophy">design requirements</a>, and <a class="link" href="#Implementation" title="4. Implementation">implementation</a>  of the Tor Browser. It is current as of Tor Browser
6
-6.5.1.
6
+7.0.11.
7 7
 
8 8
   </p><p>
9 9
 
... ...
@@ -25,7 +25,7 @@ Support Release (ESR) Firefox branch</a>. We have a <a class="ulink" href="https
25 25
 against this browser to enhance privacy and security. Browser behavior is
26 26
 additionally augmented through the <a class="ulink" href="https://gitweb.torproject.org/torbutton.git/tree/" target="_top">Torbutton
27 27
 extension</a>, though we are in the process of moving this functionality
28
-into direct Firefox patches. We also <a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/tree/browser/app/profile/000-tor-browser.js?h=tor-browser-45.8.0esr-6.5-2" target="_top">change
28
+into direct Firefox patches. We also <a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/tree/browser/app/profile/000-tor-browser.js?h=tor-browser-52.5.2esr-7.0-2" target="_top">change
29 29
 a number of Firefox preferences</a> from their defaults.
30 30
 
31 31
    </p><p>
... ...
@@ -39,7 +39,7 @@ Instantbird, and XULRunner.
39 39
 To help protect against potential Tor Exit Node eavesdroppers, we include
40 40
 <a class="ulink" href="https://www.eff.org/https-everywhere" target="_top">HTTPS-Everywhere</a>. To
41 41
 provide users with optional defense-in-depth against JavaScript and other
42
-potential exploit vectors, we also include <a class="ulink" href="http://noscript.net/" target="_top">NoScript</a>. We also modify <a class="ulink" href="https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js" target="_top">several
42
+potential exploit vectors, we also include <a class="ulink" href="https://noscript.net/" target="_top">NoScript</a>. We also modify <a class="ulink" href="https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js" target="_top">several
43 43
 extension preferences</a> from their defaults.
44 44
 
45 45
    </p><p>
... ...
@@ -47,7 +47,7 @@ extension preferences</a> from their defaults.
47 47
 To provide censorship circumvention in areas where the public Tor network is
48 48
 blocked either by IP, or by protocol fingerprint, we include several <a class="ulink" href="https://trac.torproject.org/projects/tor/wiki/doc/AChildsGardenOfPluggableTransports" target="_top">Pluggable
49 49
 Transports</a> in the distribution. As of this writing, we include <a class="ulink" href="https://gitweb.torproject.org/pluggable-transports/obfs4.git" target="_top">Obfs3proxy,
50
-Obfs4proxy, Scramblesuit</a>,
50
+Obfs4proxy</a>,
51 51
 <a class="ulink" href="https://trac.torproject.org/projects/tor/wiki/doc/meek" target="_top">meek</a>,
52 52
 and <a class="ulink" href="https://fteproxy.org/" target="_top">FTE</a>.
53 53
 
... ...
@@ -214,7 +214,7 @@ linkability.
214 214
 <a class="ulink" href="https://trac.torproject.org/projects/tor/ticket/3100" target="_top">Another
215 215
 failure of Torbutton</a> was the options panel. Each option
216 216
 that detectably alters browser behavior can be used as a fingerprinting tool.
217
-Similarly, all extensions <a class="ulink" href="http://blog.chromium.org/2010/06/extensions-in-incognito.html" target="_top">should be
217
+Similarly, all extensions <a class="ulink" href="https://blog.chromium.org/2010/06/extensions-in-incognito.html" target="_top">should be
218 218
 disabled in the mode</a> except as an opt-in basis. We should not load
219 219
 system-wide and/or operating system provided addons or plugins.
220 220
 
... ...
@@ -233,17 +233,17 @@ permissions can be written to disk. Otherwise, they should remain memory-only.
233 233
      </p></li><li class="listitem"><span class="command"><strong>No filters</strong></span><p>
234 234
 
235 235
 Site-specific or filter-based addons such as <a class="ulink" href="https://addons.mozilla.org/en-US/firefox/addon/adblock-plus/" target="_top">AdBlock
236
-Plus</a>, <a class="ulink" href="http://requestpolicy.com/" target="_top">Request Policy</a>,
237
-<a class="ulink" href="http://www.ghostery.com/about" target="_top">Ghostery</a>, <a class="ulink" href="http://priv3.icsi.berkeley.edu/" target="_top">Priv3</a>, and <a class="ulink" href="http://sharemenot.cs.washington.edu/" target="_top">Sharemenot</a> are to be
236
+Plus</a>, <a class="ulink" href="https://requestpolicy.com/" target="_top">Request Policy</a>,
237
+<a class="ulink" href="https://www.ghostery.com/about-ghostery/" target="_top">Ghostery</a>, <a class="ulink" href="http://priv3.icsi.berkeley.edu/" target="_top">Priv3</a>, and <a class="ulink" href="https://sharemenot.cs.washington.edu/" target="_top">Sharemenot</a> are to be
238 238
 avoided. We believe that these addons do not add any real privacy to a proper
239 239
 <a class="link" href="#Implementation" title="4. Implementation">implementation</a> of the above <a class="link" href="#privacy" title="2.2. Privacy Requirements">privacy requirements</a>, and that development efforts
240
-should be focused on general solutions that prevent tracking by all
241
-third parties, rather than a list of specific URLs or hosts.
240
+should be focused on general solutions that prevent tracking by all third
241
+parties, rather than a list of specific URLs or hosts.
242 242
      </p><p>
243 243
 Implementing filter-based blocking directly into the browser, such as done with
244
-<a class="ulink" href="http://ieee-security.org/TC/SPW2015/W2SP/papers/W2SP_2015_submission_32.pdf" target="_top">
244
+<a class="ulink" href="https://ieee-security.org/TC/SPW2015/W2SP/papers/W2SP_2015_submission_32.pdf" target="_top">
245 245
 Firefox' Tracking Protection</a>, does not alleviate the concerns mentioned
246
-in the previous paragraph. There is still just a list concerned with specific
246
+in the previous paragraph. There is still just a list containing specific
247 247
 URLs and hosts which, in this case, are
248 248
 <a class="ulink" href="https://services.disconnect.me/disconnect-plaintext.json" target="_top">
249 249
 assembled</a> by <a class="ulink" href="https://disconnect.me/trackerprotection" target="_top">
... ...
@@ -256,11 +256,14 @@ Even with a precision rate at 99% and a false positive rate at 0.1% trackers
256 256
 would be missed and sites would be wrongly blocked.
257 257
      </p><p>
258 258
 Filter-based solutions in general can also introduce strange breakage and cause
259
-usability nightmares. Coping with those easily leads to just <a class="ulink" href="https://github.com/mozilla-services/shavar-list-exceptions" target="_top">whitelisting
259
+usability nightmares. For instance, there is a trend to observe that websites
260
+start <a class="ulink" href="https://petsymposium.org/2017/papers/issue3/paper25-2017-3-source.pdf" target="_top">
261
+detecting filer extensions and block access to content</a> on them. Coping
262
+with this fallout easily leads to just <a class="ulink" href="https://github.com/mozilla-services/shavar-list-exceptions" target="_top">whitelisting
260 263
 </a>
261
-the affected domains defeating the purpose of the filter in the first place.
262
-Filters will also fail to do their job if an adversary simply
263
-registers a new domain or <a class="ulink" href="http://ieee-security.org/TC/SPW2015/W2SP/papers/W2SP_2015_submission_24.pdf" target="_top">
264
+the affected domains, hoping that this helps, defeating the purpose of the
265
+filter in the first place. Filters will also fail to do their job if an
266
+adversary simply registers a new domain or <a class="ulink" href="https://ieee-security.org/TC/SPW2015/W2SP/papers/W2SP_2015_submission_24.pdf" target="_top">
264 267
 creates a new URL path</a>. Worse still, the unique filter sets that each
265 268
 user creates or installs will provide a wealth of fingerprinting targets.
266 269
       </p><p>
... ...
@@ -436,7 +439,7 @@ about the user agent.
436 439
 Also, JavaScript can be used to query the user's timezone via the
437 440
 <code class="function">Date()</code> object, <a class="ulink" href="https://www.khronos.org/registry/webgl/specs/1.0/#5.13" target="_top">WebGL</a> can
438 441
 reveal information about the video card in use, and high precision timing
439
-information can be used to <a class="ulink" href="http://w2spconf.com/2011/papers/jspriv.pdf" target="_top">fingerprint the CPU and
442
+information can be used to <a class="ulink" href="https://cseweb.ucsd.edu/~hovav/dist/jspriv.pdf" target="_top">fingerprint the cpu and
440 443
 interpreter speed</a>. JavaScript features such as
441 444
 <a class="ulink" href="https://www.w3.org/TR/resource-timing/" target="_top">Resource Timing</a>
442 445
 may leak an unknown amount of network timing related information. And, moreover,
... ...
@@ -455,7 +458,7 @@ fingerprintability. Additionally, plugins are capable of extracting font lists,
455 458
 interface addresses, and other machine information that is beyond what the
456 459
 browser would normally provide to content. In addition, plugins can be used to
457 460
 store unique identifiers that are more difficult to clear than standard
458
-cookies.  <a class="ulink" href="http://epic.org/privacy/cookies/flash.html" target="_top">Flash-based
461
+cookies.  <a class="ulink" href="https://epic.org/privacy/cookies/flash.html" target="_top">Flash-based
459 462
 cookies</a> fall into this category, but there are likely numerous other
460 463
 examples. Beyond fingerprinting, plugins are also abysmal at obeying the proxy
461 464
 settings of the browser.
... ...
@@ -475,7 +478,7 @@ encrypted traffic patterns of specific websites. In the case of Tor, this
475 478
 attack would take place between the user and the Guard node, or at the Guard
476 479
 node itself.
477 480
      </p><p> The most comprehensive study of the statistical properties of this
478
-attack against Tor was done by <a class="ulink" href="http://lorre.uni.lu/~andriy/papers/acmccs-wpes11-fingerprinting.pdf" target="_top">Panchenko
481
+attack against Tor was done by <a class="ulink" href="https://lorre.uni.lu/~andriy/papers/acmccs-wpes11-fingerprinting.pdf" target="_top">Panchenko
479 482
 et al</a>. Unfortunately, the publication bias in academia has encouraged
480 483
 the production of
481 484
 <a class="ulink" href="https://blog.torproject.org/blog/critique-website-traffic-fingerprinting-attacks" target="_top">a
... ...
@@ -494,7 +497,7 @@ In general, with machine learning, as you increase the <a class="ulink" href="ht
494 497
 categories to classify</a> while maintaining a limit on reliable feature
495 498
 information you can extract, you eventually run out of descriptive feature
496 499
 information, and either true positive accuracy goes down or the false positive
497
-rate goes up. This error is called the <a class="ulink" href="http://www.cs.washington.edu/education/courses/csep573/98sp/lectures/lecture8/sld050.htm" target="_top">bias
500
+rate goes up. This error is called the <a class="ulink" href="https://www.cs.washington.edu/education/courses/csep573/98sp/lectures/lecture8/sld050.htm" target="_top">bias
498 501
 in your hypothesis space</a>. In fact, even for unbiased hypothesis
499 502
 spaces, the number of training examples required to achieve a reasonable error
500 503
 bound is <a class="ulink" href="https://en.wikipedia.org/wiki/Probably_approximately_correct_learning#Equivalence" target="_top">a
... ...
@@ -507,7 +510,7 @@ In the case of this attack, the key factors that increase the classification
507 510
 complexity (and thus hinder a real world adversary who attempts this attack)
508 511
 are large numbers of dynamically generated pages, partially cached content,
509 512
 and also the non-web activity of the entire Tor network. This yields an
510
-effective number of "web pages" many orders of magnitude larger than even <a class="ulink" href="http://lorre.uni.lu/~andriy/papers/acmccs-wpes11-fingerprinting.pdf" target="_top">Panchenko's
513
+effective number of "web pages" many orders of magnitude larger than even <a class="ulink" href="https://lorre.uni.lu/~andriy/papers/acmccs-wpes11-fingerprinting.pdf" target="_top">Panchenko's
511 514
 "Open World" scenario</a>, which suffered continuous near-constant decline
512 515
 in the true positive rate as the "Open World" size grew (see figure 4). This
513 516
 large level of classification complexity is further confounded by a noisy and
... ...
@@ -579,7 +582,7 @@ are typically linked for these cases.
579 582
 Proxy obedience is assured through the following:
580 583
    </p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><span class="command"><strong>Firefox proxy settings, patches, and build flags</strong></span><p>
581 584
 
582
-Our <a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/tree/browser/app/profile/000-tor-browser.js?h=tor-browser-45.8.0esr-6.5-2" target="_top">Firefox
585
+Our <a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/tree/browser/app/profile/000-tor-browser.js?h=tor-browser-52.5.2esr-7.0-2" target="_top">Firefox
583 586
 preferences file</a> sets the Firefox proxy settings to use Tor directly
584 587
 as a SOCKS proxy. It sets <span class="command"><strong>network.proxy.socks_remote_dns</strong></span>,
585 588
 <span class="command"><strong>network.proxy.socks_version</strong></span>,
... ...
@@ -595,11 +598,11 @@ as set the pref <span class="command"><strong>media.peerconnection.enabled</stro
595 598
  </p><p>
596 599
 
597 600
 We also patch Firefox in order to provide several defense-in-depth mechanisms
598
-for proxy safety. Notably, we <a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-45.8.0esr-6.5-2&amp;id=177e78923b3252a7442160486ec48252a6adb77a" target="_top">patch
601
+for proxy safety. Notably, we <a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-52.5.2esr-7.0-2&amp;id=35ce9974e034c0374fb3c8e00e9eb0231c4f3378" target="_top">patch
599 602
 the DNS service</a> to prevent any browser or addon DNS resolution, and we
600
-also <a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-45.8.0esr-6.5-2&amp;id=6e17cef8f3cf61fdabf99e40d5e09a730142d6cd" target="_top">
603
+also <a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-52.5.2esr-7.0-2&amp;id=ee28d8f27fdb1e47481987535c7da70095042ee2" target="_top">
601 604
 remove the DNS lookup for the profile lock signature</a>. Furhermore, we
602
-<a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-45.8.0esr-6.5-2&amp;id=8197f6ffe58ba167e3bca4230c5721ebcfae55de" target="_top">patch
605
+<a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-52.5.2esr-7.0-2&amp;id=ffba8d1b84431b4024d5012b326cbcb986047f27" target="_top">patch
603 606
 OCSP and PKIX code</a> to prevent any use of the non-proxied command-line
604 607
 tool utility functions from being functional while linked in to the browser.
605 608
 In both cases, we could find no direct paths to these routines in the browser,
... ...
@@ -607,7 +610,7 @@ but it seemed better safe than sorry.
607 610
 
608 611
  </p><p>
609 612
 
610
-For further defense-in-depth we disabled WebIDE because it can bypass proxy
613
+For further defense-in-depth we disable WebIDE because it can bypass proxy
611 614
 settings for remote debugging, and also because it downloads extensions we
612 615
 have not reviewed. We
613 616
 are doing this by setting
... ...
@@ -616,26 +619,21 @@ are doing this by setting
616 619
 <span class="command"><strong>devtools.webide.enabled</strong></span>, and
617 620
 <span class="command"><strong>devtools.appmanager.enabled</strong></span> to <span class="command"><strong>false</strong></span>.
618 621
 Moreover, we removed the Roku Screen Sharing and screencaster code with a
619
-<a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-45.8.0esr-6.5-2&amp;id= ad4abdb2e724fec060063f460604b829c66ea08a" target="_top">
622
+<a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-52.5.2esr-7.0-2&amp;id=055bdffbef68bc8d5e8005b3c7dd2f5d99da1163" target="_top">
620 623
 Firefox patch</a> as these features can bypass proxy settings as well.
621 624
  </p><p>
622
-Shumway is removed, too, for possible proxy bypass risks. We did this by
623
-backporting a <a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-45.8.0esr-6.5-2&amp;id=d020a4992d8d25baf7dfb5c8b308d80b47a8d312" target="_top">
624
-number</a> <a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-45.8.0esr-6.5-2&amp;id=98bf6c81b22cb5e4651a5fc060182f27b26c8ee5" target="_top">
625
-of</a> <a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-45.8.0esr-6.5-2&amp;id=14b723f28a6b1dd78093691013d1bf7d49dc4413" target="_top">Mozilla patches</a>.
626
-Further down on our road to proxy safety we <a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-45.8.0esr-6.5-2&amp;id=a9e1d8eac28abb364bbfd3adabeae287751a6a8e" target="_top">
627
-disabled the network tickler</a> as it has the capability to send UDP
628
-traffic.
629
- </p><p>
630
-
631
-Finally, we <a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-45.8.0esr-6.5-2&amp;id=8e52265653ab223dc5af679f9f0c073b44371fa4" target="_top">
632
-disabled mDNS support</a>, since mDNS uses UDP packets. We also disable
625
+Further down on our road to proxy safety we <a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-52.5.2esr-7.0-2&amp;id=7222d02638689a64d7297b8e5c202f9c37547523" target="_top">
626
+disable the network tickler</a> as it has the capability to send UDP
627
+traffic and we <a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-52.5.2esr-7.0-2&amp;id=5bc957b4f635a659f9aecaa374972ecca7f770a8" target="_top">
628
+disable mDNS support</a>, since mDNS uses UDP packets as well. We also disable
633 629
 Mozilla's TCPSocket by setting
634 630
 <span class="command"><strong>dom.mozTCPSocket.enabled</strong></span> to <span class="command"><strong>false</strong></span>. We
635 631
 <a class="ulink" href="https://trac.torproject.org/projects/tor/ticket/18866" target="_top">intend to
636 632
 rip out</a> the TCPSocket code in the future to have an even more solid
637 633
 guarantee that it won't be used by accident.
638
-
634
+ </p><p>
635
+Finally, we <a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-52.5.2esr-7.0-2&amp;id=55bd129f081bd37ae9e72ae32434fbb56ff4e446" target="_top">
636
+remove</a> potentially unsafe Rust code.
639 637
  </p><p>
640 638
 During every Extended Support Release transition, we perform <a class="ulink" href="https://gitweb.torproject.org/tor-browser-spec.git/tree/audits" target="_top">in-depth
641 639
 code audits</a> to verify that there were no system calls or XPCOM
... ...
@@ -651,7 +649,7 @@ protocol helpers, such as SMB URLs and other custom protocol handlers are all
651 649
 blocked.
652 650
  </p></li><li class="listitem"><span class="command"><strong>Disabling plugins</strong></span><p>
653 651
 Plugins, like Flash, have the ability to make arbitrary OS system calls and
654
-<a class="ulink" href="http://decloak.net/" target="_top">bypass proxy settings</a>. This includes
652
+<a class="ulink" href="https://ip-check.info/" target="_top">bypass proxy settings</a>. This includes
655 653
 the ability to make UDP sockets and send arbitrary data independent of the
656 654
 browser proxy settings.
657 655
  </p><p>
... ...
@@ -667,9 +665,9 @@ restricted from automatic load through Firefox's click-to-play preference
667 665
 
668 666
 In addition, to reduce any unproxied activity by arbitrary plugins at load
669 667
 time, and to reduce the fingerprintability of the installed plugin list, we
670
-also patch the Firefox source code to <a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-45.8.0esr-6.5-2&amp;id=09883246904ce4dede9f3c4d4bb8d644aefe9d1d" target="_top">
668
+also patch the Firefox source code to <a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-52.5.2esr-7.0-2&amp;id=95a0100fd8ac0fdbe9f517e9b7ea86d6b77ec2c9" target="_top">
671 669
 prevent the load of any plugins except for Flash and Gnash</a>. Even for
672
-Flash and Gnash, we also patch Firefox to <a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-45.8.0esr-6.5-2&amp;id=9a0d506e3655f2fdec97ee4217f354941e39b5b3" target="_top">
670
+Flash and Gnash, we also patch Firefox to <a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-52.5.2esr-7.0-2&amp;id=39f5a767c0c082b1e4a001cf685a6efb31bd62c6" target="_top">
673 671
 prevent loading them into the address space</a> until they are explicitly
674 672
 enabled.
675 673
  </p><p>
... ...
@@ -681,23 +679,39 @@ can't be built reproducibly or are binary blobs which we are not allowed to
681 679
 audit (or both). For the EME case we use the <span class="command"><strong>--disable-eme</strong></span>
682 680
 configure switch and set
683 681
 <span class="command"><strong>browser.eme.ui.enabled</strong></span>,
682
+<span class="command"><strong>media.gmp-eme-adobe.visible</strong></span>,
684 683
 <span class="command"><strong>media.gmp-eme-adobe.enabled</strong></span>,
684
+<span class="command"><strong>media.gmp-widevinecdm.visible</strong></span>,
685
+<span class="command"><strong>media.gmp-widevinecdm.enabled</strong></span>,
685 686
 <span class="command"><strong>media.eme.enabled</strong></span>, and
686 687
 <span class="command"><strong>media.eme.apiVisible</strong></span> to <span class="command"><strong>false</strong></span> to indicate
687 688
 to the user that this feature is disabled. For GMPs in general we make sure that
688 689
 the external server is not even pinged for updates/downloads in the first place
689 690
 by setting <span class="command"><strong>media.gmp-manager.url.override</strong></span> to
690 691
 <span class="command"><strong>data:text/plain,</strong></span> and avoid any UI with <span class="command"><strong>
691
-media.gmp-provider.enabled</strong></span> set to <span class="command"><strong>false</strong></span>.
692
+  media.gmp-provider.enabled</strong></span> set to <span class="command"><strong>false</strong></span>. Moreover,
693
+we disable GMP downloads via local fallback by setting
694
+<span class="command"><strong>media.gmp-manager.updateEnabled</strong></span> to <span class="command"><strong>false</strong></span>.
695
+To reduce our attack surface we exclude the ClearKey EME system, too.
692 696
 
693 697
  </p></li><li class="listitem"><span class="command"><strong>External App Blocking and Drag Event Filtering</strong></span><p>
694 698
 
695 699
 External apps can be induced to load files that perform network activity.
696 700
 Unfortunately, there are cases where such apps can be launched automatically
697
-with little to no user input. In order to prevent this, Torbutton installs a
698
-component to <a class="ulink" href="https://gitweb.torproject.org/torbutton.git/tree/src/components/external-app-blocker.js" target="_top">
701
+with little to no user input. In order to prevent this, we ship <a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-52.5.2esr-7.0-2&amp;id=d179d8a4861199e203934ecc36dd6d8ade549dfa" target="_top">
702
+Firefox</a> <a class="ulink" href="https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-52.5.2esr-7.0-2&amp;id=99173c3a5f83d9ac44091a72c5570efd296dff8f" target="_top">patches</a> and Torbutton installs a component to <a class="ulink" href="https://gitweb.torproject.org/torbutton.git/tree/src/components/external-app-blocker.js" target="_top">
699 703
 provide the user with a popup</a> whenever the browser attempts to launch
700
-a helper app.
704
+a helper application.
705
+
706
+  </p><p>
707
+