Browse code

Merge branch 'master' into faq-ipv6

traumschule authored on22/08/2018 21:40:50
Showing22 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,12 @@
1
+# https://www.torproject.org/about/contact#security
2
+Contact: tor-security@lists.torproject.org
3
+Encryption: openpgp4fpr:8B904624C5A28654E4539BC2E135A8B41A7BF184
4
+Acknowledgments: https://trac.torproject.org/projects/tor/wiki/org/teams/NetworkTeam/SecurityPolicy
5
+
6
+Policy: https://trac.torproject.org/projects/tor/wiki/org/teams/NetworkTeam/SecurityPolicy
7
+Hiring: https://www.torproject.org/about/jobs
8
+
9
+Permission: None
10
+
11
+# RFC-URL: https://tools.ietf.org/html/draft-foudil-securitytxt-04
12
+Signature: https://torproject.org/.well-known/security.txt.sig
... ...
@@ -62,13 +62,19 @@
62 62
 
63 63
     <a id="irc"></a>
64 64
     <h3><a class="anchor" href="#irc">IRC</a></h3>
65
-    <p>Tor users and developers can also be found in the following channels on <a
66
-    href="https://www.oftc.net/">OFTC</a>:</p>
65
+    <p>Tor users and developers can also be found in the following
66
+    channels on <a href="https://www.oftc.net/">OFTC</a>
67
+    (<a href="https://www.oftc.net/Tor/">join via Tor</a>):</p>
67 68
 
68 69
     <ul>
69
-      <li><i>#tor</i> - For questions about using Tor (as a client, as
70
-      a relay, as an onion service). Having trouble running Tor or have
71
-      a question for other Tor users? Then this is the spot for you.</li>
70
+      <li><i>#tor</i> - For questions about using Tor (as a client,
71
+      or as an onion service). Having trouble running Tor or have a
72
+      question for other Tor users? Then this is the spot for you.</li>
73
+      <li><i>#tor-relays</i> - The Tor network is made of relays, if
74
+      you are interested in running one yourself, join here and make sure
75
+      to read this
76
+      <a href="https://blog.torproject.org/get-help-running-your-relay-our-new-advocate">blog post</a>
77
+      on how to get help running a relay.</li>
72 78
       <li><i>#tor-dev</i> - Channel for people who want to do development.
73 79
       Discussions about Tor-related coding, protocols, and <a href="<page
74 80
       getinvolved/volunteer>">project ideas</a> are all welcome.</li>
... ...
@@ -115,6 +121,7 @@ uid                  tor-security@lists.torproject.org <tor-security-owner@lists
115 121
 uid                  tor-security@lists.torproject.org <tor-security-request@lists.torproject.org>
116 122
 sub   4096R/C00942E4 2017-03-13
117 123
 </pre></blockquote>
124
+    Find links to <a href="https://trac.torproject.org/projects/tor/wiki/org/teams/NetworkTeam/SecurityPolicy">acknowledgments and our security policy</a> in machine readable form at <a href="">https://torproject.org/.well-known/security.txt</a>.
118 125
     </p>
119 126
 
120 127
     <a id="badrelays"></a>
... ...
@@ -207,6 +207,15 @@
207 207
   </tr>
208 208
 
209 209
   <tr>
210
+    <td>
211
+      <a id="emmapeel"></a>
212
+      <div class="photo"><img src="$(IMGROOT)/people/emmapeel.png" alt="emmapeel" /></div>
213
+      <div class="name"><a href="#emmapeel">emmapeel</a></div>
214
+      <div class="field"><b>IRC:</b> emmapeel</div>
215
+      <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div>
216
+      <div class="description">emmapeel coordinates the localization (translations) of the different Tor software.</div>
217
+    </td>
218
+
210 219
     <td>
211 220
       <a id="ewyatt"></a>
212 221
       <div class="photo"><img src="$(IMGROOT)/people/ewyatt.png" alt="ewyatt" /></div>
... ...
@@ -215,7 +224,9 @@
215 224
       <div class="field"><b>IRC:</b> ewyatt</div>
216 225
       <div class="description">Non-technical switchboard for people-related things: recruiting, onboarding, benefits, contracts, TPI policy questions, and baked goods.</div>
217 226
     </td>
227
+  </tr>
218 228
 
229
+  <tr>
219 230
     <td>
220 231
       <a id="biella"></a>
221 232
       <div class="photo"><img src="$(IMGROOT)/people/biella.png" alt="biella" /></div>
... ...
@@ -225,9 +236,7 @@
225 236
       <div class="field"><b>IRC:</b> biella</div>
226 237
       <div class="description"><a href="http://gabriellacoleman.org/">Anthropologist</a> and Wolfe Chair in Scientific and Technological Literacy at McGill University.</div>
227 238
     </td>
228
-  </tr>
229 239
 
230
-  <tr>
231 240
     <td>
232 241
       <a id="gman999"></a>
233 242
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -235,7 +244,9 @@
235 244
       <div class="field"><b>IRC:</b> gman999</div>
236 245
       <div class="description">Tor BSD Diversity Project member, long-time relay operator, trainer.</div>
237 246
     </td>
247
+  </tr>
238 248
 
249
+  <tr>
239 250
     <td>
240 251
       <a id="GeKo"></a>
241 252
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -244,9 +255,7 @@
244 255
       <div class="field"><b>IRC:</b> GeKo</div>
245 256
       <div class="description">Currently lead of the Tor Browser team.</div>
246 257
     </td>
247
-  </tr>
248 258
 
249
-  <tr>
250 259
     <td>
251 260
       <a id="asn"></a>
252 261
       <div class="photo"><img src="$(IMGROOT)/people/asn.png" alt="asn" /></div>
... ...
@@ -255,7 +264,9 @@
255 264
       <div class="field"><b>IRC:</b> asn</div>
256 265
       <div class="description">Onion services. Security analysis. Used to obfsproxy. Follower of the onion.</div>
257 266
     </td>
267
+  </tr>
258 268
 
269
+  <tr>
259 270
     <td>
260 271
       <a id="saint"></a>
261 272
       <div class="photo"><img src="$(IMGROOT)/people/saint.png" alt="saint" /></div>
... ...
@@ -265,9 +276,7 @@
265 276
       <div class="field"><b>IRC:</b> saint</div>
266 277
       <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>
267 278
     </td>
268
-  </tr>
269 279
 
270
-  <tr>
271 280
     <td>
272 281
       <a id="ggus"></a>
273 282
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -276,7 +285,9 @@
276 285
       <div class="field"><b>IRC:</b> ggus</div>
277 286
       <div class="description">Works as Community Liaison in Global South. Trainer, relay operator and Tor advocate. CryptoRave organizer.</div>
278 287
     </td>
288
+  </tr>
279 289
 
290
+  <tr>
280 291
     <td>
281 292
       <a id="nyinz"></a>
282 293
       <div class="photo"><img src="$(IMGROOT)/people/nyinz.png" alt="nyinz" /></div>
... ...
@@ -285,9 +296,7 @@
285 296
       <div class="field"><b>IRC:</b> nyinz</div>
286 297
       <div class="description">I am very excited and honored to contribute to the Tor project on its mission to provide usable technologies to the global south.</div>
287 298
     </td>
288
-  </tr>
289 299
 
290
-  <tr>
291 300
     <td>
292 301
       <a id="irl"></a>
293 302
       <div class="photo"><img src="$(IMGROOT)/people/irl.png" alt="irl" /></div>
... ...
@@ -298,7 +307,9 @@
298 307
       <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div>
299 308
       <div class="description"><a href="https://metrics.torproject.org">Metrics team member</a> and maintainer of <a href="https://metrics.torproject.org/rs.html">Relay Search</a>.</div>
300 309
     </td>
310
+  </tr>
301 311
 
312
+  <tr>
302 313
     <td>
303 314
       <a id="ian"></a>
304 315
       <div class="photo"><img src="$(IMGROOT)/people/ian.png" alt="ian" /></div>
... ...
@@ -307,9 +318,7 @@
307 318
       <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div>
308 319
       <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>
309 320
     </td>
310
-  </tr>
311 321
 
312
-  <tr>
313 322
     <td>
314 323
       <a id="igt0"></a>
315 324
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -319,7 +328,9 @@
319 328
       <div class="field"><b>IRC:</b> igt0</div>
320 329
       <div class="description">Works on Tor Browser.</div>
321 330
     </td>
331
+  </tr>
322 332
 
333
+  <tr>
323 334
     <td>
324 335
       <a id="intrigeri"></a>
325 336
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -328,9 +339,7 @@
328 339
       <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div>
329 340
       <div class="description">He is one of our main interfaces with the <a href="https://tails.boum.org/">Tails</a> project.</div>
330 341
     </td>
331
-  </tr>
332 342
 
333
-  <tr>
334 343
     <td>
335 344
       <a id="isabela"></a>
336 345
       <div class="photo"><img src="$(IMGROOT)/people/isabela.png" alt="isabela" /></div>
... ...
@@ -340,7 +349,9 @@
340 349
       <div class="field"><b>IRC:</b> isabela</div>
341 350
       <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>
342 351
     </td>
352
+  </tr>
343 353
 
354
+  <tr>
344 355
     <td>
345 356
       <a id="ilv"></a>
346 357
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -348,9 +359,7 @@
348 359
       <div class="name"><a href="#ilv">isra</a></div>
349 360
       <div class="description">Rewrote the <a href="https://gettor.torproject.org">GetTor</a> service.</div>
350 361
     </td>
351
-  </tr>
352 362
 
353
-  <tr>
354 363
     <td>
355 364
       <a id="iwakeh"></a>
356 365
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -358,7 +367,9 @@
358 367
       <div class="name"><a href="#iwakeh">iwakeh</a></div>
359 368
       <div class="description">Speaks Java and other languages, streamlines build processes, and scrutinizes mathematical concepts behind aggregating tons of Tor network data.</div>
360 369
     </td>
370
+  </tr>
361 371
 
372
+  <tr>
362 373
     <td>
363 374
       <a id="redshiftzero"></a>
364 375
       <div class="photo"><img src="$(IMGROOT)/people/redshiftzero.png" alt="redshiftzero" /></div>
... ...
@@ -368,9 +379,7 @@
368 379
       <div class="field"><b>IRC:</b> redshiftzero</div>
369 380
       <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>
370 381
     </td>
371
-  </tr>
372 382
 
373
-  <tr>
374 383
     <td>
375 384
       <a id="qbi"></a>
376 385
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -380,7 +389,9 @@
380 389
       <div class="field"><b>IRC:</b> qbi</div>
381 390
       <div class="description">Volunteer that helped translate the website, is part of TorServers.net, and Tor's sysadmin team.</div>
382 391
     </td>
392
+  </tr>
383 393
 
394
+  <tr>
384 395
     <td>
385 396
       <a id="jselon"></a>
386 397
       <div class="photo"><img src="$(IMGROOT)/people/jselon.png" alt="jselon" /></div>
... ...
@@ -389,9 +400,7 @@
389 400
       <div class="field"><b>IRC:</b> jselon</div>
390 401
       <div class="description">Event Coordination, donor management, general office operations.</div>
391 402
     </td>
392
-  </tr>
393 403
 
394
-  <tr>
395 404
     <td>
396 405
       <a id="juga"></a>
397 406
       <div class="photo"><img src="$(IMGROOT)/people/juga.png" alt="juga" /></div>
... ...
@@ -400,7 +409,9 @@
400 409
       <div class="field"><b>IRC:</b> juga</div>
401 410
       <div class="description">Contributed to OONI, bug tracker features, wrote tordyguards. Currently working on bandwidth scanner.</div>
402 411
     </td>
412
+  </tr>
403 413
 
414
+  <tr>
404 415
     <td>
405 416
       <a id="julius"></a>
406 417
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -409,9 +420,7 @@
409 420
       <div class="name"><a href="#julius">Julius Mittenzwei</a></div>
410 421
       <div class="description">Germany-based lawyer and Internet activist.</div>
411 422
     </td>
412
-  </tr>
413 423
 
414
-  <tr>
415 424
     <td>
416 425
       <a id="juris"></a>
417 426
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -420,7 +429,9 @@
420 429
       <div class="field"><b>IRC:</b> juris</div>
421 430
       <div class="description">Board member of torservers.net.</div>
422 431
     </td>
432
+  </tr>
423 433
 
434
+  <tr>
424 435
     <td>
425 436
       <a id="karsten"></a>
426 437
       <div class="photo"><img src="$(IMGROOT)/people/karsten.png" alt="karsten" /></div>
... ...
@@ -430,9 +441,7 @@
430 441
       <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div>
431 442
       <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>
432 443
     </td>
433
-  </tr>
434 444
 
435
-  <tr>
436 445
     <td>
437 446
       <a id="kat5"></a>
438 447
       <div class="photo"><img src="$(IMGROOT)/people/kat5.png" alt="kat5" /></div>
... ...
@@ -442,7 +451,9 @@
442 451
       <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div>
443 452
       <div class="description">Volunteer on the Community Team. Helps with t-shirts for relay operators and other odds and ends.</div>
444 453
     </td>
454
+  </tr>
445 455
 
456
+  <tr>
446 457
     <td>
447 458
       <a id="ailanthus"></a>
448 459
       <div class="photo"><img src="$(IMGROOT)/people/ailanthus.png" alt="ailanthus" /></div>
... ...
@@ -452,9 +463,7 @@
452 463
       <div class="field"><b>IRC:</b> ailanthus</div>
453 464
       <div class="description">Writes about Tor in mainstream and technical publications and conducts community workshops to teach people about Tor.</div>
454 465
     </td>
455
-  </tr>
456 466
 
457
-  <tr>
458 467
     <td>
459 468
       <a id="kushal"></a>
460 469
       <div class="photo"><img src="$(IMGROOT)/people/kushal.png" alt="kushal" /></div>
... ...
@@ -465,16 +474,16 @@
465 474
       <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div>
466 475
       <div class="description"><a href="https://securedrop.org">SecureDrop</a> developer at the <a href="https://freedom.press">Freedom of Press Foundation</a>. Member of the community team, privacy advocate focusing on new users.</div>
467 476
     </td>
477
+  </tr>
468 478
 
479
+  <tr>
469 480
     <td>
470 481
       <a id="leif"></a>
471 482
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
472 483
       <div class="name"><a href="#leif">Leif Ryge</a></div>
473 484
       <div class="description">Works on security analysis, designer of &quot;bananaphone&quot; transport.</div>
474 485
     </td>
475
-  </tr>
476 486
 
477
-  <tr>
478 487
     <td>
479 488
       <a id="ln5"></a>
480 489
       <div class="photo"><img src="$(IMGROOT)/people/ln5.png" alt="ln5" /></div>
... ...
@@ -483,7 +492,9 @@
483 492
       <div class="field"><b>IRC:</b> ln5</div>
484 493
       <div class="description">Swedish advocate and Tor Board member. He works on implementing IPv6 in Tor, build automation, and runs a directory authority.</a></div>
485 494
     </td>
495
+  </tr>
486 496
 
497
+  <tr>
487 498
     <td>
488 499
       <a id="agrabeli"></a>
489 500
       <div class="photo"><img src="$(IMGROOT)/people/agrabeli.png" alt="agrabeli" /></div>
... ...
@@ -494,9 +505,7 @@
494 505
       <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div>
495 506
       <div class="description">Maria manages OONI's Partnership Program and writes research reports on internet censorship around the world.</div>
496 507
     </td>
497
-  </tr>
498 508
 
499
-  <tr>
500 509
     <td>
501 510
       <a id="mcs"></a>
502 511
       <div class="photo"><img src="$(IMGROOT)/people/mcs.png" alt="mcs" /></div>
... ...
@@ -506,7 +515,9 @@
506 515
       <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div>
507 516
       <div class="description">Developer on the Tor Browser team.</div>
508 517
     </td>
518
+  </tr>
509 519
 
520
+  <tr>
510 521
     <td>
511 522
       <a id="matt"></a>
512 523
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -514,9 +525,7 @@
514 525
       <div class="name"><a href="#matt">Matt Blaze</a></div>
515 526
       <div class="description">Chairs the Tor Board of Directors. Professor at the University of Pennsylvania where he researches security, privacy, and anonymity.</div>
516 527
     </td>
517
-  </tr>
518 528
 
519
-  <tr>
520 529
     <td>
521 530
       <a id="pastly"></a>
522 531
       <div class="photo"><img src="$(IMGROOT)/people/pastly.png" alt="pastly" /></div>
... ...
@@ -525,7 +534,9 @@
525 534
       <div class="field"><b>IRC:</b> pastly</div>
526 535
       <div class="description">Matt <a href="http://mattttttssi4lhud.onion/">implemented</a> the <a href="http://www.robgjansen.com/publications/kist-sec2014.pdf">KIST scheduler</a> into Tor. He helps safely measure Tor and says helpful things on IRC.</div>
527 536
     </td>
537
+  </tr>
528 538
 
539
+  <tr>
529 540
     <td>
530 541
       <a id="sysrqb"></a>
531 542
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -535,9 +546,7 @@
535 546
       <div class="field"><b>IRC:</b> sysrqb</div>
536 547
       <div class="description">Worked on tor, torsocks, and many other projects. Helped maintain and develop BridgeDB.</div>
537 548
     </td>
538
-  </tr>
539 549
 
540
-  <tr>
541 550
     <td>
542 551
       <a id="meejah"></a>
543 552
       <div class="photo"><img src="$(IMGROOT)/people/meejah.png" alt="meejah" /></div>
... ...
@@ -547,7 +556,9 @@
547 556
       <div class="field"><b>IRC:</b> meejah</div>
548 557
       <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>
549 558
     </td>
559
+  </tr>
550 560
 
561
+  <tr>
551 562
     <td>
552 563
       <a id="micahflee"></a>
553 564
       <div class="photo"><img src="$(IMGROOT)/people/micahflee.png" alt="micahflee" /></div>
... ...
@@ -556,9 +567,7 @@
556 567
       <div class="name"><a href="#micahflee">Micah Lee</a></div>
557 568
       <div class="description">Developer of <a href="https://github.com/micahflee/onionshare">OnionShare</a> and <a href="https://github.com/micahflee/torbrowser-launcher">Tor Browser Launcher</a> journalist and security engineer at <a href="https://theintercept.com/staff/micah-lee/">The Intercept</a> and advocate for <a href="https://freedom.press/">freedom of the press</a>.</div>
558 569
     </td>
559
-  </tr>
560 570
 
561
-  <tr>
562 571
     <td>
563 572
       <a id="mtigas"></a>
564 573
       <div class="photo"><img src="$(IMGROOT)/people/mtigas.png" alt="mtigas" /></div>
... ...
@@ -568,7 +577,9 @@
568 577
       <div class="field"><b>IRC:</b> mtigas</div>
569 578
       <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>
570 579
     </td>
580
+  </tr>
571 581
 
582
+  <tr>
572 583
     <td>
573 584
       <a id="moritz"></a>
574 585
       <div class="photo"><img src="$(IMGROOT)/people/moritz.png" alt="moritz" /></div>
... ...
@@ -577,9 +588,7 @@
577 588
       <div class="name"><a href="#moritz">Moritz Bartl</a></div>
578 589
       <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>
579 590
     </td>
580
-  </tr>
581 591
 
582
-  <tr>
583 592
     <td>
584 593
       <a id="n8fr8"></a>
585 594
       <div class="photo"><img src="$(IMGROOT)/people/n8fr8.png" alt="n8fr8" /></div>
... ...
@@ -588,7 +597,9 @@
588 597
       <div class="field"><b>IRC:</b> n8fr8</div>
589 598
       <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>
590 599
     </td>
600
+  </tr>
591 601
 
602
+  <tr>
592 603
     <td>
593 604
       <a id="nickhopper"></a>
594 605
       <div class="photo"><img src="$(IMGROOT)/people/nickhopper.png" alt="nickhopper" /></div>
... ...
@@ -597,9 +608,7 @@
597 608
       <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div>
598 609
       <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>
599 610
     </td>
600
-  </tr>
601 611
 
602
-  <tr>
603 612
     <td>
604 613
       <a id="nickm"></a>
605 614
       <div class="photo"><img src="$(IMGROOT)/people/nickm.png" alt="nickm" /></div>
... ...
@@ -610,7 +619,9 @@
610 619
       <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div>
611 620
       <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>
612 621
     </td>
622
+  </tr>
613 623
 
624
+  <tr>
614 625
     <td>
615 626
       <a id="boklm"></a>
616 627
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -620,9 +631,7 @@
620 631
       <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div>
621 632
       <div class="description">Works on Tor Browser.</div>
622 633
     </td>
623
-  </tr>
624 634
 
625
-  <tr>
626 635
     <td>
627 636
       <a id="mrphs"></a>
628 637
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -632,7 +641,9 @@
632 641
       <div class="field"><b>IRC:</b> mrphs</div>
633 642
       <div class="description">His main area of interests are End-users Accessibility/Security, UX, Censorship, Advocacy and Onion Services.</div>
634 643
     </td>
644
+  </tr>
635 645
 
646
+  <tr>
636 647
     <td>
637 648
       <a id="pari"></a>
638 649
       <div class="photo"><img src="$(IMGROOT)/people/pari.png" alt="pari" /></div>
... ...
@@ -642,9 +653,7 @@
642 653
       <div class="field"><b>IRC:</b> pari</div>
643 654
       <div class="description">Works with UX and Community teams, and on Tor India initiatives. Started as an Outreachy intern.</div>
644 655
     </td>
645
-  </tr>
646 656
 
647
-  <tr>
648 657
     <td>
649 658
       <a id="syverson"></a>
650 659
       <div class="photo"><img src="$(IMGROOT)/people/syverson.png" alt="syverson" /></div>
... ...
@@ -652,7 +661,9 @@
652 661
       <div class="field"><b>IRC:</b> syverson</div>
653 662
       <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>
654 663
     </td>
664
+  </tr>
655 665
 
666
+  <tr>
656 667
     <td>
657 668
       <a id="pepijn"></a>
658 669
       <div class="photo"><img src="$(IMGROOT)/people/pepijn.png" alt="pepijn" /></div>
... ...
@@ -661,16 +672,16 @@
661 672
       <div class="name"><a href="#pepijn">Pepijn Le Heux</a></div>
662 673
       <div class="description">Lawyer based in The Netherlands and co-founder of Hart voor Internetvrijheid.</div>
663 674
     </td>
664
-  </tr>
665 675
 
666
-  <tr>
667 676
     <td>
668 677
       <a id="peter"></a>
669 678
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
670 679
       <div class="name"><a href="#peter">Peter Palfrader</a></div>
671 680
       <div class="description">Manages the Debian packages, runs one of the directory authorities, and generally helps out a lot.</div>
672 681
     </td>
682
+  </tr>
673 683
 
684
+  <tr>
674 685
     <td>
675 686
       <a id="phw"></a>
676 687
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -680,9 +691,7 @@
680 691
       <div class="field"><b>IRC:</b> phw</div>
681 692
       <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>
682 693
     </td>
683
-  </tr>
684 694
 
685
-  <tr>
686 695
     <td>
687 696
       <a id="robt"></a>
688 697
       <div class="photo"><img src="$(IMGROOT)/people/robt.png" alt="robt" /></div>
... ...
@@ -690,7 +699,9 @@
690 699
       <div class="name"><a href="#robt">Rabbi Rob Thomas</a></div>
691 700
       <div class="description">CEO of Team Cymru, which supports Tor through hosting, research, and infosec assistance.</div>
692 701
     </td>
702
+  </tr>
693 703
 
704
+  <tr>
694 705
     <td>
695 706
       <a id="ramy"></a>
696 707
       <div class="photo"><img src="$(IMGROOT)/people/ramy.png" alt="ramy" /></div>
... ...
@@ -699,9 +710,7 @@
699 710
       <div class="name"><a href="#ramy">Ramy Raoof</a></div>
700 711
       <div class="description">Tor Board member, technologist, and privacy and security researcher.</div>
701 712
     </td>
702
-  </tr>
703 713
 
704
-  <tr>
705 714
     <td>
706 715
       <a id="pospeselr"></a>
707 716
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -711,7 +720,9 @@
711 720
       <div class="field"><b>IRC:</b> pospeselr</div>
712 721
       <div class="description">Tor Browser developer.</div>
713 722
     </td>
723
+  </tr>
714 724
 
725
+  <tr>
715 726
     <td>
716 727
       <a id="robgjansen"></a>
717 728
       <div class="photo"><img src="$(IMGROOT)/people/robgjansen.png" alt="robgjansen" /></div>
... ...
@@ -721,9 +732,7 @@
721 732
       <div class="field"><b>IRC:</b> robgjansen</div>
722 733
       <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>
723 734
     </td>
724
-  </tr>
725 735
 
726
-  <tr>
727 736
     <td>
728 737
       <a id="arma"></a>
729 738
       <div class="photo"><img src="$(IMGROOT)/people/arma.png" alt="arma" /></div>
... ...
@@ -733,7 +742,9 @@
733 742
       <div class="field"><b>IRC:</b> arma</div>
734 743
       <div class="description">Original developer of Tor along with Nick and Paul. Leading privacy researcher, coordinating developers and researchers.</div>
735 744
     </td>
745
+  </tr>
736 746
 
747
+  <tr>
737 748
     <td>
738 749
       <a id="sajolida"></a>
739 750
       <div class="photo"><img src="$(IMGROOT)/people/sajolida.png" alt="sajolida" /></div>
... ...
@@ -742,9 +753,7 @@
742 753
       <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div>
743 754
       <div class="description">Technical writing, UX, and fundraising for Tails.</div>
744 755
     </td>
745
-  </tr>
746 756
 
747
-  <tr>
748 757
     <td>
749 758
       <a id="sstevenson"></a>
750 759
       <div class="photo"><img src="$(IMGROOT)/people/sstevenson.png" alt="sstevenson" /></div>
... ...
@@ -752,7 +761,9 @@
752 761
       <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div>
753 762
       <div class="description">Directs and coordinates all fundraising activities.</div>
754 763
     </td>
764
+  </tr>
755 765
 
766
+  <tr>
756 767
     <td>
757 768
       <a id="sebastian"></a>
758 769
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -760,9 +771,7 @@
760 771
       <div class="name"><a href="#sebastian">Sebastian Hahn</a></div>
761 772
       <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>
762 773
     </td>
763
-  </tr>
764 774
 
765
-  <tr>
766 775
     <td>
767 776
       <a id="sisbell"></a>
768 777
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -772,7 +781,9 @@
772 781
       <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div>
773 782
       <div class="description">Works on Tor Browser for Android.</div>
774 783
     </td>
784
+  </tr>
775 785
 
786
+  <tr>
776 787
     <td>
777 788
       <a id="ssteele"></a>
778 789
       <div class="photo"><img src="$(IMGROOT)/people/ssteele.png" alt="ssteele" /></div>
... ...
@@ -783,9 +794,7 @@
783 794
       <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div>
784 795
       <div class="description">Executive Director of the Tor Project, Inc.</div>
785 796
     </td>
786
-  </tr>
787 797
 
788
-  <tr>
789 798
     <td>
790 799
       <a id="hiro"></a>
791 800
       <div class="photo"><img src="$(IMGROOT)/people/hiro.png" alt="hiro" /></div>
... ...
@@ -795,7 +804,9 @@
795 804
       <div class="field"><b>IRC:</b> hiro</div>
796 805
       <div class="description">Hiro builds and runs Tor Project's web applications and services.</div>
797 806
     </td>
807
+  </tr>
798 808
 
809
+  <tr>
799 810
     <td>
800 811
       <a id="inf0"></a>
801 812
       <div class="photo"><img src="$(IMGROOT)/people/inf0.png" alt="inf0" /></div>
... ...
@@ -805,9 +816,7 @@
805 816
       <div class="field"><b>IRC:</b> inf0</div>
806 817
       <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>
807 818
     </td>
808
-  </tr>
809 819
 
810
-  <tr>
811 820
     <td>
812 821
       <a id="stephw"></a>
813 822
       <div class="photo"><img src="$(IMGROOT)/people/stephw.png" alt="stephw" /></div>
... ...
@@ -818,7 +827,9 @@
818 827
       <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div>
819 828
       <div class="description">Directs communications.</div>
820 829
     </td>
830
+  </tr>
821 831
 
832
+  <tr>
822 833
     <td>
823 834
       <a id="sjmurdoch"></a>
824 835
       <div class="photo"><img src="$(IMGROOT)/people/sjmurdoch.png" alt="sjmurdoch" /></div>
... ...
@@ -828,9 +839,7 @@
828 839
       <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div>
829 840
       <div class="description"><a href=""http://murdoch.is/"">Principal Research Fellow</a> at University College London. He is the original creator of the <a href=""https://www.torproject.org/projects/torbrowser.html.en"">Tor Browser</a>.</div>
830 841
     </td>
831
-  </tr>
832 842
 
833
-  <tr>
834 843
     <td>
835 844
       <a id="sukhe"></a>
836 845
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -839,7 +848,9 @@
839 848
       <div class="field"><b>IRC:</b> sukhe</div>
840 849
       <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>
841 850
     </td>
851
+  </tr>
842 852
 
853
+  <tr>
843 854
     <td>
844 855
       <a id="haxxpop"></a>
845 856
       <div class="photo"><img src="$(IMGROOT)/people/haxxpop.png" alt="haxxpop" /></div>
... ...
@@ -849,9 +860,7 @@
849 860
       <div class="field"><b>IRC:</b> haxxpop</div>
850 861
       <div class="description">Contributes to core Tor and especially onion services.</div>
851 862
     </td>
852
-  </tr>
853 863
 
854
-  <tr>
855 864
     <td>
856 865
       <a id="catalyst"></a>
857 866
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -862,7 +871,9 @@
862 871
       <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/they/them">they</a></div>
863 872
       <div class="description">Software archaeologist and keeper of C language arcana. Works with applied cryptography, protocol design, software security, and technical debt restructuring.</div>
864 873
     </td>
874
+  </tr>
865 875
 
876
+  <tr>
866 877
     <td>
867 878
       <a id="teor"></a>
868 879
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -872,9 +883,7 @@
872 883
       <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/they/them">they</a></div>
873 884
       <div class="description">Tor developer and chutney maintainer. Currently working on onion services, directory documents, and statistics.</div>
874 885
     </td>
875
-  </tr>
876 886
 
877
-  <tr>
878 887
     <td>
879 888
       <a id="tjr"></a>
880 889
       <div class="photo"><img src="$(IMGROOT)/people/tjr.png" alt="tjr" /></div>
... ...
@@ -885,7 +894,9 @@
885 894
       <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div>
886 895
       <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>
887 896
     </td>
897
+  </tr>
888 898
 
899
+  <tr>
889 900
     <td>
890 901
       <a id="t0mmy"></a>
891 902
       <div class="photo"><img src="$(IMGROOT)/people/t0mmy.png" alt="t0mmy" /></div>
... ...
@@ -895,9 +906,7 @@
895 906
       <div class="field"><b>IRC:</b> t0mmy</div>
896 907
       <div class="description">Writes and edits grant proposals, one-pagers, blogposts, etc.</div>
897 908
     </td>
898
-  </tr>
899 909
 
900
-  <tr>
901 910
     <td>
902 911
       <a id="egypcio"></a>
903 912
       <div class="photo"><img src="$(IMGROOT)/people/egypcio.png" alt="egypcio" /></div>
... ...
@@ -907,7 +916,9 @@
907 916
       <div class="field"><b>IRC:</b> egypcio</div>
908 917
       <div class="description">TorBSD Diversity Project (TDP); IPv6 Enthusiast, BSD Systems Evangelist, and Bridges/Relays Operator.</div>
909 918
     </td>
919
+  </tr>
910 920
 
921
+  <tr>
911 922
     <td>
912 923
       <a id="wseltzer"></a>
913 924
       <div class="photo"><img src="$(IMGROOT)/people/wseltzer.png" alt="wseltzer" /></div>
... ...
@@ -918,9 +929,7 @@
918 929
       <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div>
919 930
       <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>
920 931
     </td>
921
-  </tr>
922 932
 
923
-  <tr>
924 933
     <td>
925 934
       <a id="yawning"></a>
926 935
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
... ...
@@ -17,8 +17,6 @@
17 17
 
18 18
     <p>Specifically, we're looking for the following people currently:</p>
19 19
     <ul>
20
-      <li><a href="<page about/jobs-projectmanager-network>">Project Manager for Network Projects</a></li>
21
-      <li><a href="<page about/jobs-projectmanager-product>">Project Manager with Product Experience</a></li>
22 20
       <li><a href="<page about/jobs-sysadmin>">Senior Systems Administrator</a></li>
23 21
       <li><a href="<page about/jobs-grantsmanager>">Grants Manager</a></li>
24 22
       <li><a href="<page about/jobs-grantwriter>">Grant Writer</a></li>
... ...
@@ -44,6 +42,8 @@
44 42
       <li>Chief Financial and Grants Officer</li>
45 43
       <li>Android OS Developer</li>
46 44
       <li>Fundraising Director</li>
45
+      <li>Project Manager for Network Projects</li>
46
+      <li>Project Manager with Product Experience</li>
47 47
     </ul>
48 48
 
49 49
     <p>About the company:<br>
... ...
@@ -27,7 +27,21 @@
27 27
 
28 28
     <a name="overview"></a>
29 29
     <h3><a class="anchor" href="#overview">Overview</a></h3>
30
-
30
+    <p>
31
+	A two-minute video explaining what Tor is and how it works.
32
+	This video is available for <a href="https://media.torproject
33
+	.org/video/2015-03-animation/">download</a> and streaming
34
+	both on Tor Project <a href="https://blog.torproject.org/blog/
35
+	releasing-tor-animation">website</a> and via <a href="https://www
36
+	.youtube.com/playlist?list=PLwyU2dZ3LJErtu3GGElIa7VyORE2B6H1H">
37
+	YouTube</a> in many different languages.
38
+    </p>
39
+    <div style="text-align:center;">
40
+    <video width="500" height="281" controls preload="none" poster="../images/tor-animation.jpg">
41
+	<source src="https://www.torproject.org/videos/Tor_Animation_en.mp4" type="video/mp4">
42
+	<track label="English" kind="captions" src="https://www.torproject.org/videos/en.vtt" srclang="en" default>
43
+    </video>
44
+    </div>
31 45
     <p>
32 46
     The Tor network is a group of <a href="<page
33 47
     getinvolved/volunteer>">volunteer</a>-operated servers that allows people
... ...
@@ -13,7 +13,7 @@ var software = {
13 13
                      'artful':  [ 'artful'],
14 14
                      'bionic':  [ 'bionic'],
15 15
                      },
16
-         'experimental-0.3.3.x': {
16
+         'experimental-0.3.4.x': {
17 17
                      'jessie':  [ 'jessie' ],
18 18
                      'stretch': [ 'stretch' ],
19 19
                      'buster':  [ 'buster' ],
... ...
@@ -45,7 +45,7 @@ var software = {
45 45
                      'artful':  [ 'artful'],
46 46
                      'bionic':  [ 'bionic'],
47 47
                      },
48
-         'experimental-0.3.3.x': {
48
+         'experimental-0.3.4.x': {
49 49
                      'jessie':  [ 'jessie' ],
50 50
                      'stretch': [ 'stretch' ],
51 51
                      'buster':  [ 'buster' ],
... ...
@@ -87,13 +87,14 @@ version
87 87
 
88 88
 
89 89
 <div id="apt-source">
90
-<p>You need to add the following entry in <code>/etc/apt/sources.list</code> or a new file in <code>/etc/apt/sources.list.d/</code>:</p>
90
+<p>You need to add the following entries to <code>/etc/apt/sources.list</code> or a new file in
91
+<code>/etc/apt/sources.list.d/</code>:</p>
91 92
 
92 93
 <blockquote><pre id="sources">deb https://deb.torproject.org/torproject.org jessie main
93 94
 </pre></blockquote>
94 95
 </div>
95 96
 
96
-<p>Note: To use this source line in <i>/etc/apt/sources.list</i> The <a
97
+<p>Note: To use source lines with https:// in <i>/etc/apt/sources.list</i> the <a
97 98
 href="https://packages.debian.org/stretch/apt-transport-https">apt-transport-https
98 99
 package</a> is required. Install it with
99 100
 <blockquote><pre>
... ...
@@ -101,6 +102,12 @@ apt install apt-transport-https
101 102
 </pre></blockquote>
102 103
 to enable the usage of 'deb https://foo distro main' lines in the /etc/apt/sources.list so that all package managers using the libapt-pkg library can access metadata and packages available in sources accessible over https (Hypertext Transfer Protocol Secure).</p>
103 104
 
105
+<p>To use Apt with Tor later replace <tt>https://</tt> with <tt>tor://</tt> and run
106
+<blockquote><pre>
107
+apt install apt-transport-tor
108
+</pre></blockquote>
109
+</p>
110
+
104 111
 <div id="sig">
105 112
 <p>Then add the gpg key used to sign the packages by running the following commands at your command prompt:</p>
106 113
 <blockquote><pre>
... ...
@@ -112,15 +119,13 @@ gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
112 119
 
113 120
 <div id="apt-get">
114 121
 <p>You can install it with the following commands:</p>
115
-<blockquote><pre>$ apt update
116
-<span id="regular-install">$ apt install <span id="apt-package">tor</span> deb.torproject.org-keyring</span>
122
+<blockquote><pre>apt update
123
+<span id="regular-install">apt install <span id="apt-package">tor</span> deb.torproject.org-keyring</span>
117 124
 <span id="source-install">$ apt install build-essential fakeroot devscripts
118 125
 $ apt build-dep tor deb.torproject.org-keyring</span></pre></blockquote>
119 126
 
120 127
 <div id="source-install2">
121
-<p>
122
-Then you can build Tor in ~/debian-packages:
123
-</p>
128
+<p>Then you can build Tor in ~/debian-packages:</p>
124 129
 <blockquote><pre>
125 130
 $ mkdir ~/debian-packages; cd ~/debian-packages
126 131
 $ apt source tor
... ...
@@ -149,6 +154,27 @@ or whatever it is)
149 154
 in place of &lt;DISTRIBUTION&gt;.
150 155
 </p>
151 156
 
157
+<p>
158
+If you want to use the <a href="<page download/download-unix>#packagediff">development branch</a> of Tor instead (more features and more bugs), you need add a different set of lines to your <i>/etc/apt/sources.list</i> file:<br />
159
+<pre style="margin: 1.5em 0 1.5em 2em">
160
+deb     https://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
161
+deb     https://deb.torproject.org/torproject.org tor-experimental-0.3.4.x-&lt;DISTRIBUTION&gt; main
162
+</pre>
163
+</p>
164
+
165
+<p>Note: To use source lines with <tt>https://</tt> in <i>/etc/apt/sources.list</i> the <a
166
+href="https://packages.debian.org/stretch/apt-transport-https">apt-transport-https
167
+package</a> is required. Install it with
168
+<blockquote><pre>
169
+apt install apt-transport-https
170
+</pre></blockquote>
171
+to enable the usage of 'deb https://foo distro main' lines in the /etc/apt/sources.list so that all package managers using the libapt-pkg library can access metadata and packages available in sources accessible over https (Hypertext Transfer Protocol Secure).</p>
172
+
173
+<p>To use Apt with Tor later replace <tt>https://</tt> with <tt>tor://</tt> and run <blockquote><pre>
174
+apt install apt-transport-tor
175
+</pre></blockquote>
176
+</p>
177
+
152 178
 <p>
153 179
 Then add the gpg key used to sign the packages by running the following
154 180
 commands at your command prompt:
... ...
@@ -166,16 +192,9 @@ If there are no errors you're good to continue.
166 192
 
167 193
 <p>
168 194
 We provide a Debian package to help you keep our signing key current.  It is
169
-recommended you use it.  Install it using
195
+recommended you use it.  Install it along with tor using
170 196
 <pre style="margin: 1.5em 0 1.5em 2em">
171
-apt install deb.torproject.org-keyring
172
-</pre>
173
-</p>
174
-
175
-<p>
176
-To finally install Tor just run:
177
-<pre style="margin: 1.5em 0 1.5em 2em">
178
-apt install tor
197
+apt install tor deb.torproject.org-keyring
179 198
 </pre>
180 199
 </p>
181 200
 
... ...
@@ -187,7 +206,6 @@ docs/tor-doc-unix>#using">step two</a> of the "Tor on Linux/Unix"
187 206
 instructions.
188 207
 </p>
189 208
 
190
-<noscript>
191 209
 <p style="font-size: small">
192 210
 The DNS name <code>deb.torproject.org</code> is actually a set of independent
193 211
 servers in a DNS round robin configuration.  If you for some reason cannot
... ...
@@ -198,46 +216,19 @@ access it you might try to use the name of one of its part instead.  Try
198 216
 </p>
199 217
 
200 218
 <p><code>deb.torproject.org</code> is also served through now also served via onion service:
201
-<a href="http://sdscoq7snqtznauu.onion">http://sdscoq7snqtznauu.onion/</a>.
219
+<a href="http://sdscoq7snqtznauu.onion">http://sdscoq7snqtznauu.onion/</a> To use the onion service with apt, replace the address in the previously added lines:
220
+<pre style="margin: 1.5em 0 1.5em 2em">.
221
+# For the stable version.
222
+deb tor://sdscoq7snqtznauu.onion/torproject.org buster main
223
+
224
+# For the unstable version.
225
+deb tor://sdscoq7snqtznauu.onion/torproject.org tor-nightly-master-&lt;DISTRIBUTION&gt; main
226
+</pre>
202 227
 <br />
203 228
 See <a href="https://onion.torproject.org/">https://onion.torproject.org</a> for all
204 229
 torproject.org onion addresses.</p>
205 230
 
206
-<hr />
207
-
208
-<a id="development"></a>
209
-<h2><a class="anchor" href="#development">Option three: Using the
210
-development branch of Tor on Debian or Ubuntu</a></h2>
211
-<br />
212
-
213
-<p>If you want to use the <a href="<page
214
-download/download-unix>#packagediff">development branch</a> of Tor instead
215
-(more features and more bugs), you need to add a different set of lines
216
-to your <tt>/etc/apt/sources.list</tt> file:<br />
217
-<pre style="margin: 1.5em 0 1.5em 2em">
218
-deb     https://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main
219
-deb     https://deb.torproject.org/torproject.org tor-experimental-0.3.4.x-&lt;DISTRIBUTION&gt; main
220
-</pre>
221
-where you again substitute the name of your distro (stretch, buster,
222
-sid, xenial, ...) in place of
223
-&lt;DISTRIBUTION&gt;.
224
-</p>
225
-
226
-<p>
227
-Then run the following commands at your command prompt:
228
-<pre style="margin: 1.5em 0 1.5em 2em">
229
-gpg --recv A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89
230
-gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
231
-apt update
232
-apt install tor deb.torproject.org-keyring
233
-</pre>
234
-</p>
235
-
236
-<p>
237
-Now Tor is installed and running. Move on to <a href="<page
238
-docs/tor-doc-unix>#using">step two</a> of the "Tor on Linux/Unix"
239
-instructions.
240
-</p>
231
+<noscript>
241 232
 
242 233
 <hr />
243 234
 
... ...
@@ -53,13 +53,16 @@
53 53
     file</a>. We also provide a <a href="<page docs/tor-manual-dev>">manual for
54 54
     the development version of Tor</a>.</li>
55 55
 
56
-    <li>If you have questions, we have an IRC channel (for users, relay
57
-    operators, and developers)
58
-    at <a href="irc://irc.oftc.net/tor">#tor on irc.oftc.net</a>. If
59
-    you have a bug, especially a crash bug, read <a
60
-    href="<wikifaq>#MyTorkeepscrashing.">how
61
-    to report a Tor bug</a> first and then tell us as much information
62
-    about it as you can in
56
+    <li>If you have questions, we have an IRC channel at
57
+    <a href="irc://irc.oftc.net/tor">#tor on irc.oftc.net</a> (you can
58
+    <a href="https://www.oftc.net/Tor/">join via Tor</a> as well). Developers work
59
+    in <a href="irc://irc.oftc.net/tor-dev">#tor-dev</a> and relay operators
60
+    help each other in <a href="irc://irc.oftc.net/tor-relays">#tor-relays</a>,
61
+    read this fine article by
62
+    <a href="https://blog.torproject.org/get-help-running-your-relay-our-new-advocate">
63
+    Tor's Relay Advocate</a>. If you have a bug, especially a crash bug, read
64
+    <a href="<wikifaq>#MyTorkeepscrashing.">how to report a Tor bug</a>
65
+    first and then tell us as much information about it as you can in
63 66
     <a href="https://bugs.torproject.org/tor">our bugtracker</a>.
64 67
     (If your bug is
65 68
     with your browser or some other application, please don't put
... ...
@@ -20,17 +20,19 @@
20 20
     <li><a href="#WhatAboutSpammers">What about spammers?</a></li>
21 21
     <li><a href="#HowMuchAbuse">Does Tor get much abuse?</a></li>
22 22
     <li><a href="#TypicalAbuses">So what should I expect if I run an exit relay?</a></li>
23
+    <li><a href="#RespondISP">How do I respond to my ISP about my exit relay?</a></li>
23 24
     <li><a href="#IrcBans">Tor is banned from the IRC network I want to use.</a></li>
24 25
     <li><a href="#SMTPBans">Your nodes are banned from the mail server I want to use.</a></li>
25 26
     <li><a href="#Bans">I want to ban the Tor network from my service.</a></li>
26 27
     <li><a href="#TracingUsers">I have a compelling reason to trace a Tor user. Can you help?</a></li>
27
-    <li><a href="#RemoveContent">I want some content removed from a
28
-.onion address.</a></li>
29
-    <li><a href="#AbuseOpinion">Where does Tor Project stand on abusers
30
-using technology?</a></li>
28
+    <li><a href="#RemoveContent">I want some content removed from a .onion address.</a></li>
29
+    <li><a href="#AbuseOpinion">Where does Tor Project stand on abusers using technology?</a></li>
31 30
     <li><a href="#LegalQuestions">I have legal questions about Tor abuse.</a></li>
31
+    <li><a href="#HelpPoliceOrLawyers">I have questions about a Tor IP address for a legal case.</a></li>
32 32
     </ul>
33
-    <hr>
33
+
34
+    <a id="abuse"></a>
35
+    <h4 style="margin-bottom: 18px"><a class="anchor" href="#abuse">Abuse:</a></h4>
34 36
 
35 37
     <a id="WhatAboutCriminals"></a>
36 38
     <h3><a class="anchor" href="#WhatAboutCriminals">Doesn't Tor enable criminals to do bad things?</a></h3>
... ...
@@ -62,10 +64,6 @@ using technology?</a></li>
62 64
     and other privacy measures can <em>fight</em> identity theft, physical
63 65
     crimes like stalking, and so on. </p>
64 66
 
65
-    #<a id="Pervasive"></a>
66
-    #<h3><a class="anchor" href="#Pervasive">If the whole world starts using
67
-    #Tor, won't civilization collapse?</a></h3>
68
-
69 67
     <a id="DDoS"></a>
70 68
     <h3><a class="anchor" href="#DDoS">What about distributed denial of service attacks?</a></h3>
71 69
 
... ...
@@ -111,9 +109,7 @@ using technology?</a></li>
111 109
     <a id="ExitPolicies"></a>
112 110
     <h3><a class="anchor" href="#ExitPolicies">How do Tor exit policies work?</a></h3>
113 111
 
114
-    <p>
115
-    <a href="<page docs/faq>#ExitPolicies">See the main FAQ</a>
116
-    </p>
112
+    <p><a href="<page docs/faq>#ExitPolicies">See the main FAQ</a></p>
117 113
 
118 114
     <a id="HowMuchAbuse"></a>
119 115
     <h3><a class="anchor" href="#HowMuchAbuse">Does Tor get much abuse?</a></h3>
... ...
@@ -175,6 +171,12 @@ using technology?</a></li>
175 171
     might consider running your Tor relay on it.) In general, it's advisable
176 172
     not to use your home internet connection to provide a Tor relay.</p>
177 173
 
174
+    <a id="RespondISP"></a>
175
+    <h3><a class="anchor" href="#RespondISP">How do I respond to my ISP about my exit relay?</a></h3>
176
+
177
+    <p>A collection of templates for successfully responding to ISPs is <a
178
+    href="<wiki>doc/TorAbuseTemplates">collected here</a>.</p>
179
+
178 180
     <a id="IrcBans"></a>
179 181
     <h3><a class="anchor" href="#IrcBans">Tor is banned from the IRC network I want to use.</a></h3>
180 182
 
... ...
@@ -417,6 +419,26 @@ about Tor abuse.</a></h3>
417 419
     <p>Please take a look at the
418 420
     <a href="<page eff/tor-legal-faq>">Tor Legal FAQ</a>,
419 421
     and contact EFF directly if you have any further legal questions. </p>
422
+
423
+   <a id="HelpPoliceOrLawyers"></a>
424
+   <h3><a class="anchor" href="#HelpPoliceOrLawyers">I have questions about
425
+   a Tor IP address for a legal case.</a></h3>
426
+
427
+   <p>
428
+   Please read the <a
429
+   href="https://www.torproject.org/eff/tor-legal-faq">legal FAQ written
430
+   by EFF lawyers</a>. There's a growing <a
431
+   href="https://blog.torproject.org/blog/start-tor-legal-support-directory">legal
432
+   directory</a> of people who may be able to help you.
433
+   </p>
434
+
435
+   <p>
436
+   If you need to check if a certain IP address was acting as a Tor exit
437
+   node at a certain date and time, you can use the <a
438
+   href="https://exonerator.torproject.org/">ExoneraTor tool</a> to query the
439
+   historic Tor relay lists and get an answer.
440
+   </p>
441
+
420 442
   </div>
421 443
   <!-- END MAINCOL -->
422 444
   <div id = "sidecol">
... ...
@@ -15,13 +15,14 @@
15 15
     <hr>
16 16
 
17 17
     <a id="general"></a>
18
-    <h4 style="margin-bottom: 18px"><a class="anchor" href="#general">General questions:</a></h4>
18
+    <h4 style="margin-bottom: 18px"><a class="anchor" href="#general">General
19
+    questions:</a></h4>
19 20
     <ul>
20 21
     <li><a href="#WhatIsTor">What is Tor?</a></li>
21
-    <li><a href="#Torisdifferent">How is Tor different from other
22
-proxies?</a></li>
23
-    <li><a href="#CompatibleApplications">What programs can I use with
24
-    Tor?</a></li>
22
+    <li><a href="#Torisdifferent">How is Tor different from other proxies?
23
+    </a></li>
24
+    <li><a href="#CompatibleApplications">What programs can I use with Tor?
25
+    </a></li>
25 26
     <li><a href="#WhyCalledTor">Why is it called Tor?</a></li>
26 27
     <li><a href="#Backdoor">Is there a backdoor in Tor?</a></li>
27 28
     <li><a href="#DistributingTor">Can I distribute Tor?</a></li>
... ...
@@ -30,22 +31,23 @@ proxies?</a></li>
30 31
     <li><a href="#WhySlow">Why is Tor so slow?</a></li>
31 32
     <li><a href="#FileSharing">How can I share files anonymously through Tor?
32 33
     </a></li>
33
-    <li><a href="#Funding">What would The Tor Project do with more
34
-    funding?</a></li>
34
+    <li><a href="#Funding">What would The Tor Project do with more funding?
35
+    </a></li>
35 36
     <li><a href="#IsItWorking">How can I tell if Tor is working, and that my
36 37
     connections really are anonymized?</a></li>
37 38
     <li><a href="#Mobile">Can I use Tor on my phone or mobile device?</a></li>
38
-    <li><a href="#OutboundPorts">Which outbound ports must be open when
39
-    using Tor as a client?</a></li>
39
+    <li><a href="#OutboundPorts">Which outbound ports must be open when using
40
+    Tor as a client?</a></li>
40 41
     <li><a href="#FTP">How do I use my browser for ftp with Tor?</a></li>
41
-    <li><a href="#NoDataScrubbing">Does Tor remove personal information
42
-    from the data my application sends?</a></li>
43
-    <li><a href="#Metrics">How many people use Tor? How many relays or
44
-    exit nodes are there?</a></li>
42
+    <li><a href="#NoDataScrubbing">Does Tor remove personal information from
43
+    the data my application sends?</a></li>
44
+    <li><a href="#Metrics">How many people use Tor? How many relays or exit
45
+    nodes are there?</a></li>
45 46
     </ul>
46 47
 
47 48
     <a id="comp-install"></a>
48
-    <h4 style="margin-bottom: 18px"><a class="anchor" href="#comp-install">Compilation and Installation:</a></h4>
49
+    <h4 style="margin-bottom: 18px"><a class="anchor" href="#comp-install">
50
+    Compilation and Installation:</a></h4>
49 51
 
50 52
     <ul>
51 53
     <li><a href="#HowUninstallTor">How do I uninstall Tor?</a></li>
... ...
@@ -56,12 +58,13 @@ proxies?</a></li>
56 58
     <li><a href="#VirusFalsePositives">Why does my Tor executable appear to
57 59
     have a virus or spyware?</a></li>
58 60
     <li><a href="#tarballs">How do I open a .tar.gz or .tar.xz file?</a></li>
59
-    <li><a href="#LiveCD">Is there a LiveCD or other bundle that
60
-includes Tor?</a></li>
61
+    <li><a href="#LiveCD">Is there a LiveCD or other bundle that includes Tor?
62
+    </a></li>
61 63
     </ul>
62 64
 
63 65
     <a id="tbb"></a>
64
-    <h4 style="margin-bottom: 18px"><a class="anchor" href="#tbb">Tor Browser (general):</a></h4>
66
+    <h4 style="margin-bottom: 18px"><a class="anchor" href="#tbb">Tor Browser
67
+    (general):</a></h4>
65 68
     <ul>
66 69
 
67 70
     <li><a href="#TBBFlash">Why can't I view videos on YouTube and other
... ...
@@ -70,13 +73,12 @@ includes Tor?</a></li>
70 73
     </a></li>
71 74
     <li><a href="#SophosOnMac">I'm using the Sophos anti-virus
72 75
     software on my Mac, and Tor starts but I can't browse anywhere.</a></li>
73
-    <li><a href="#XPCOMError">When I start Tor Browser I get an 
74
-error message: "Cannot load XPCOM".</a></li>
76
+    <li><a href="#XPCOMError">When I start Tor Browser I get an  error message:
77
+    "Cannot load XPCOM".</a></li>
75 78
     <li><a href="#TBBOtherExtensions">Can I install other Firefox
76 79
     extensions? Which extensions should I avoid using?</a></li>
77
-    <li><a href="#TBBJavaScriptEnabled">Why is NoScript configured to
78
-allow JavaScript by default in Tor Browser?  Isn't that
79
-unsafe?</a></li>
80
+    <li><a href="#TBBJavaScriptEnabled">Why is NoScript configured to allow
81
+    JavaScript by default in Tor Browser?  Isn't that unsafe?</a></li>
80 82
     <li><a href="#TBBOtherBrowser">I want to use Chrome/IE/Opera/etc
81 83
     with Tor.</a></li>
82 84
     <li><a href="#GoogleCAPTCHA">Google makes me solve a CAPTCHA or tells
... ...
@@ -94,7 +96,8 @@ unsafe?</a></li>
94 96
     </ul>
95 97
 
96 98
     <a id="tbb-3plus"></a>
97
-    <h4 style="margin-bottom: 18px"><a class="anchor" href="#tbb-3plus">Tor Browser (3.x and later):</a></h4>
99
+    <h4 style="margin-bottom: 18px"><a class="anchor" href="#tbb-3plus">Tor
100
+    Browser (3.x and later):</a></h4>
98 101
 
99 102
     <ul>
100 103
     <li><a href="#DisableJS">How do I disable JavaScript?</a></li>
... ...
@@ -110,11 +113,13 @@ unsafe?</a></li>
110 113
     </ul>
111 114
 
112 115
     <a id="advanced"></a>
113
-    <h4 style="margin-bottom: 18px"><a class="anchor" href="#advanced">Advanced Tor usage:</a></h4>
116
+    <h4 style="margin-bottom: 18px"><a class="anchor" href="#advanced">Advanced
117
+    Tor usage:</a></h4>
114 118
 
115 119
     <ul>
116 120
     <li><a href="#torrc">I'm supposed to "edit my torrc". What does
117 121
     that mean?</a></li>
122
+    <li><a href="#datadir">Where's tor's data directory?</a></li>
118 123
     <li><a href="#Logs">How do I set up logging, or see Tor's
119 124
     logs?</a></li>
120 125
     <li><a href="#LogLevel">What log level should I use?</a></li>
... ...
@@ -125,13 +130,15 @@ unsafe?</a></li>
125 130
     are used for entry/exit?</a></li>
126 131
     <li><a href="#FirewallPorts">My firewall only allows a few outgoing
127 132
     ports.</a></li>
128
-    <li><a href="#DefaultExitPorts">Is there a list of default exit ports?</a></li>
133
+    <li><a href="#DefaultExitPorts">Is there a list of default exit ports?
134
+    </a></li>
129 135
     <li><a href="#WarningsAboutSOCKSandDNSInformationLeaks">I keep seeing
130 136
     these warnings about SOCKS and DNS information leaks. Should I
131 137
     worry?</a></li>
132 138
     <li><a href="#SocksAndDNS">How do I check if my application that uses
133 139
     SOCKS is leaking DNS requests?</a></li>
134
-    <li><a href="#TorClientOnADifferentComputerThanMyApplications">I want to run my Tor client on a
140
+    <li><a href="#TorClientOnADifferentComputerThanMyApplications">I want to
141
+    run my Tor client on a
135 142
     different computer than my applications.</a></li>
136 143
     <li><a href="#ServerClient">Can I install Tor on a central server, and
137 144
     have my clients connect to it?</a></li>
... ...
@@ -139,22 +146,24 @@ unsafe?</a></li>
139 146
     </ul>
140 147
 
141 148
     <a id="relay"></a>
142
-    <h4 style="margin-bottom: 18px"><a class="anchor" href="#relay">Running a Tor relay:</a></h4>
149
+    <h4 style="margin-bottom: 18px"><a class="anchor" href="#relay">Running a
150
+    Tor relay:</a></h4>
143 151
     <ul>
144 152
 
145 153
     <li><a href="#HowDoIDecide">How do I decide if I should run a relay?
146 154
     </a></li>
147
-    <li><a href="#MostNeededRelayType">What type of relays are most needed?</a></li>
155
+    <li><a href="#MostNeededRelayType">What type of relays are most needed?
156
+    </a></li>
148 157
     <li><a href="#WhyIsntMyRelayBeingUsedMore">Why isn't my relay being
149 158
     used more?</a></li>
150
-    <li><a href="#IDontHaveAStaticIP">Can I run a Tor relay using a dynamic IP address?</a></li>
159
+    <li><a href="#IDontHaveAStaticIP">Can I run a Tor relay using a dynamic IP
160
+    address?</a></li>
151 161
     <li><a href="#IPv6Relay">Can I use IPv6 on my relay?</a></li>
152 162
     <li><a href="#PortscannedMore">Why do I get portscanned more often
153 163
     when I run a Tor relay?</a></li>
154 164
     <li><a href="#HighCapacityConnection">How can I get Tor to fully
155 165
     make use of my high capacity connection?</a></li>
156
-    <li><a href="#RelayFlexible">How stable does my relay need to
157
-be?</a></li>
166
+    <li><a href="#RelayFlexible">How stable does my relay need to be?</a></li>
158 167
     <li><a href="#BandwidthShaping">What bandwidth shaping options are
159 168
     available to Tor relays?</a></li>
160 169
     <li><a href="#LimitTotalBandwidth">How can I limit the total amount
... ...
@@ -172,23 +181,21 @@ be?</a></li>
172 181
     Why did that happen?</a></li>
173 182
     <li><a href="#MyRelayRecentlyGotTheGuardFlagAndTrafficDroppedByHalf">My
174 183
     relay recently got the Guard flag and traffic dropped by half.</a></li>
175
-    <li><a href="#JoinTheNetwork">So I can just configure a nickname and
176
-    ORPort and join the network?</a></li>
177 184
     <li><a href="#RelayOrBridge">Should I be a normal relay or bridge
178 185
     relay?</a></li>
179 186
     <li><a href="#UpgradeOrMove">I want to upgrade/move my relay. How do I
180 187
     keep the same key?</a></li>
181 188
     <li><a href="#OfflineED25519">How do offline ed25519 identity keys work?
182 189
     What do I need to know?</a></li>
183
-    <li><a href="#MultipleRelays">I want to run more than one
184
-relay.</a></li>
190
+    <li><a href="#MultipleRelays">I want to run more than one relay.</a></li>
185 191
     <li><a href="#NTService">How do I run my Tor relay as an NT service?
186 192
     </a></li>
187 193
     <li><a href="#VirtualServer">Can I run a Tor relay from my virtual server
188 194
     account?</a></li>
189 195
     <li><a href="#WrongIP">My relay is picking the wrong IP address.</a></li>
190 196
     <li><a href="#BehindANAT">I'm behind a NAT/Firewall</a></li>
191
-    <li><a href="#OutgoingFirewall">How should I configure the outgoing filters on my relay?</a></li>
197
+    <li><a href="#OutgoingFirewall">How should I configure the outgoing filters
198
+    on my relay?</a></li>
192 199
     <li><a href="#RelayMemory">Why is my Tor relay using so much memory?
193 200
     </a></li>
194 201
     <li><a href="#BetterAnonymity">Do I get better anonymity if I run a relay?
... ...
@@ -200,15 +207,18 @@ relay.</a></li>
200 207
     </ul>
201 208
 
202 209
     <a id="onion-services"></a>
203
-    <h4 style="margin-bottom: 18px"><a class="anchor" href="#onion-services">Tor onion services:</a></h4>
210
+    <h4 style="margin-bottom: 18px"><a class="anchor" href="#onion-services">
211
+    Tor onion services:</a></h4>
204 212
 
205 213
     <ul>
206 214
     <li><a href="#AccessOnionServices">How do I access onion services?</a></li>
207
-    <li><a href="#ProvideAnOnionService">How do I provide an onion service?</a></li>
215
+    <li><a href="#ProvideAnOnionService">How do I provide an onion service?
216
+    </a></li>
208 217
     </ul>
209 218
 
210 219
     <a id="dev"></a>
211
-    <h4 style="margin-bottom: 18px"><a class="anchor" href="#dev">Development:</a></h4>
220
+    <h4 style="margin-bottom: 18px"><a class="anchor" href="#dev">Development:
221
+    </a></h4>
212 222
 
213 223
     <ul>
214 224
     <li><a href="#VersionNumbers">What do these weird version numbers
... ...
@@ -223,7 +233,8 @@ relay.</a></li>
223 233
     </ul>
224 234
 
225 235
     <a id="anonsec"></a>
226
-    <h4 style="margin-bottom: 18px"><a class="anchor" href="#anonsec">Anonymity and Security:</a></h4>
236
+    <h4 style="margin-bottom: 18px"><a class="anchor" href="#anonsec">Anonymity
237
+    and Security:</a></h4>
227 238
     <ul>
228 239
     <li><a href="#WhatProtectionsDoesTorProvide">What protections does Tor
229 240
     provide?</a></li>
... ...
@@ -231,8 +242,7 @@ relay.</a></li>
231 242
     communications? Isn't that bad? </a></li>
232 243
     <li><a href="#AmITotallyAnonymous">So I'm totally anonymous if I use
233 244
     Tor?</a></li>
234
-    <li><a href="#KeyManagement">Tell me about all the keys Tor
235
-uses.</a></li>
245
+    <li><a href="#KeyManagement">Tell me about all the keys Tor uses.</a></li>
236 246
     <li><a href="#EntryGuards">What are Entry Guards?</a></li>
237 247
     <li><a href="#ChangePaths">How often does Tor change its paths?</a></li>
238 248
     <li><a href="#CellSize">Tor uses hundreds of bytes for every IRC line. I
... ...
@@ -248,22 +258,25 @@ uses.</a></li>
248 258
     Tor with only 3 hops?</a></li>
249 259
     <li><a href="#AttacksOnOnionRouting">What attacks remain against onion
250 260
     routing?</a></li>
251
-    <li><a href="#LearnMoreAboutAnonymity">Where can I learn more about anonymity?</a></li>
261
+    <li><a href="#LearnMoreAboutAnonymity">Where can I learn more about
262
+    anonymity?</a></li>
252 263
     </ul>
253 264
 
254 265
     <a id="altdesigns"></a>
255
-    <h4 style="margin-bottom: 18px"><a class="anchor" href="#altdesigns">Alternate designs that we don't do (yet):</a></h4>
266
+    <h4 style="margin-bottom: 18px"><a class="anchor" href="#altdesigns">
267
+    Alternate designs that we don't do (yet):</a></h4>
256 268
 
257 269
     <ul>
258 270
     <li><a href="#EverybodyARelay">You should make every Tor user be a
259 271
     relay.</a></li>
260
-    <li><a href="#TransportIPnotTCP">You should transport all IP
261
-packets,
272
+    <li><a href="#TransportIPnotTCP">You should transport all IP packets,
262 273
     not just TCP packets.</a></li>
263 274
     <li><a href="#HideExits">You should hide the list of Tor relays,
264 275
     so people can't block the exits.</a></li>
265 276
     <li><a href="#ChoosePathLength">You should let people choose their path
266 277
     length.</a></li>
278
+    <li><a href="#ChoosePathCountries">You should change path selection to avoid
279
+    entering and exiting from the same country.</a></li>
267 280
     <li><a href="#SplitEachConnection">You should split each connection over
268 281
     many paths.</a></li>
269 282
     <li><a href="#MigrateApplicationStreamsAcrossCircuits">You should migrate
... ...
@@ -282,20 +295,9 @@ packets,
282 295
     traffic.</a></li>
283 296
     </ul>
284 297
 
285
-    <a id="abuse"></a>
286
-    <h4 style="margin-bottom: 18px"><a class="anchor" href="#abuse">Abuse:</a></h4>
287
-    <ul>
288
-    <li><a href="#Criminals">Doesn't Tor enable criminals to do bad
289
-things?</a></li>
290
-    <li><a href="#RespondISP">How do I respond to my ISP about my exit
291
-    relay?</a></li>
292
-    <li><a href="#HelpPoliceOrLawyers">I have questions about
293
-   a Tor IP address for a legal case.</a></li>
294
-    </ul>
295
-
296 298
     <p>For other questions not yet on this version of the FAQ, see the
297
-<a
298
-    href="<wikifaq>">wiki FAQ</a> for now.</p>
299
+    <a href="<wikifaq>">wiki FAQ</a> for now.
300
+    </p>
299 301
 
300 302
     <hr>
301 303
 
... ...
@@ -331,86 +333,65 @@ things?</a></li>
331 333
     <hr>
332 334
 
333 335
     <a id="Torisdifferent"></a>
334
-    <h3><a class="anchor" href="#Torisdifferent">How is Tor different
335
-from other proxies?</a></h3>
336
-    <p>
337
-    A typical proxy provider sets up a server somewhere on the Internet
338
-and
339
-allows you to use it to relay your traffic.  This creates a simple, easy
340
-to
341
-maintain architecture.  The users all enter and leave through the same
342
-server.
343
-The provider may charge for use of the proxy, or fund their costs
344
-through
345
-advertisements on the server.  In the simplest configuration, you don't
346
-have to
347
-install anything.  You just have to point your browser at their proxy
348
-server.
349
-Simple proxy providers are fine solutions if you do not want protections
350
-for
351
-your privacy and anonymity online and you trust the provider to not do
352
-bad
353
-things.  Some simple proxy providers use SSL to secure your connection
354
-to them, which protects you against local eavesdroppers, such as those at a
355
-cafe with free wifi Internet.
356
-    </p>
357
-    <p>
358
-    Simple proxy providers also create a single point of failure.  The
359
-provider
360
-knows both who you are and what you browse on the Internet.  They can see
361
-your
362
-traffic as it passes through their server.  In some cases, they can even
363
-see
364
-inside your
365
-encrypted traffic as they relay it to your banking site or to ecommerce
366
-stores.
367
-You have to trust the provider isn't
368
-watching your traffic, injecting their own advertisements into your
369
-traffic
370
-stream, or recording your personal details.
371
-    </p>
372
-    <p>
373
-    Tor passes your traffic through at least 3 different servers before
374
-sending
375
-it on to the destination. Because there's a separate layer of encryption
376
-for
377
-each of the three relays, somebody watching your Internet connection
378
-can't modify, or read, what you are
379
-sending into the Tor network. Your traffic is encrypted between the Tor
380
-client (on your computer) and where it pops out somewhere else in the
381
-world.
382
-</p>
336
+    <h3><a class="anchor" href="#Torisdifferent">How is Tor different from other
337
+    proxies?</a></h3>
338
+    <p>
339
+    A typical proxy provider sets up a server somewhere on the Internet and
340
+    allows you to use it to relay your traffic. This creates a simple, easy to
341
+    maintain architecture. The users all enter and leave through the same server.
342
+    The provider may charge for use of the proxy, or fund their costs through
343
+    advertisements on the server.  In the simplest configuration, you don't have
344
+    to install anything.  You just have to point your browser at their proxy
345
+    server.
346
+    Simple proxy providers are fine solutions if you do not want protections for
347
+    your privacy and anonymity online and you trust the provider to not do bad
348
+    things.  Some simple proxy providers use SSL to secure your connection
349
+    to them, which protects you against local eavesdroppers, such as those at a
350
+    cafe with free wifi Internet.
351
+    </p>
352
+    <p>
353
+    Simple proxy providers also create a single point of failure. The provider
354
+    knows both who you are and what you browse on the Internet. They can see
355
+    your traffic as it passes through their server.  In some cases, they can
356
+    even see inside your encrypted traffic as they relay it to your banking
357
+    site or to ecommerce stores.
358
+    You have to trust the provider isn't watching your traffic, injecting their
359
+    own advertisements into your traffic stream, or recording your personal
360
+    details.
361
+    </p>
362
+    <p>
363
+    Tor passes your traffic through at least 3 different servers before sending
364
+    it on to the destination. Because there's a separate layer of encryption for
365
+    each of the three relays, somebody watching your Internet connection can't
366
+    modify, or read, what you are sending into the Tor network. Your traffic is
367
+    encrypted between the Tor client (on your computer) and where it pops out
368
+    somewhere else in the world.
369
+    </p>
383 370
     <p>
384 371
     <dl>
385
-    <dt>Doesn't the first server see who I am?</dt><dd>Possibly. A bad
386
-first of
387
-three servers can see encrypted Tor traffic coming from your computer.
388
-It
389
-still doesn't know who you are and what you are doing over Tor.  It
390
-merely sees
391
-"This IP address is using Tor".  Tor is not illegal anywhere in the
392
-world, so
393
-using Tor by itself is fine.  You are still protected from this node
394
-figuring
395
-out both who you are and where you are going on the Internet.</dd>
396
-    <dt>Can't the third server see my traffic?</dt><dd>Possibly.  A bad
397
-third
398
-of three servers can see the traffic you sent into Tor.  It won't know
399
-who sent
400
-this traffic.  If you're using encryption (like
401
-HTTPS), it will only know the destination. See <a
402
-href="https://www.eff.org/pages/tor-and-https">this visualization of
403
-Tor and HTTPS</a> to understand how Tor and HTTPS interact.
404
-</dd>
372
+    <dt>Doesn't the first server see who I am?</dt>
373
+    <dd>Possibly. A bad first of three servers can see encrypted Tor traffic
374
+    coming from your computer. It still doesn't know who you are and what you
375
+    are doing over Tor.  It merely sees "This IP address is using Tor".  Tor is
376
+    not illegal anywhere in the world, so using Tor by itself is fine.  You are
377
+    still protected from this node figuring out both who you are and where you
378
+    are going on the Internet.
379
+    </dd>
380
+    <dt>Can't the third server see my traffic?</dt>
381
+    <dd>Possibly.  A bad third of three servers can see the traffic you sent
382
+    into Tor.  It won't know who sent this traffic.  If you're using encryption
383
+    (like HTTPS), it will only know the destination. See
384
+    <a href="https://www.eff.org/pages/tor-and-https">this visualization of Tor
385
+    and HTTPS</a> to understand how Tor and HTTPS interact.
386
+    </dd>
405 387
     </dl>
406 388
     </p>
407 389
 
408 390
     <hr>
409 391
 
410
-
411 392
     <a id="CompatibleApplications"></a>
412
-    <h3><a class="anchor" href="#CompatibleApplications">What programs
413
-can I use with Tor?</a></h3>
393
+    <h3><a class="anchor" href="#CompatibleApplications">What programs can I
394
+    use with Tor?</a></h3>
414 395
 
415 396
     <p>
416 397
     Most people use Tor Browser,
... ...
@@ -432,8 +413,7 @@ can I use with Tor?</a></h3>
432 413
     <hr>
433 414
 
434 415
     <a id="WhyCalledTor"></a>
435
-    <h3><a class="anchor" href="#WhyCalledTor">Why is it called
436
-Tor?</a></h3>
416
+    <h3><a class="anchor" href="#WhyCalledTor">Why is it called Tor?</a></h3>
437 417
 
438 418
     <p>
439 419
     Because Tor is the onion routing network. When we were starting the
... ...
@@ -450,21 +430,17 @@ Tor?</a></h3>
450 430
     </p>
451 431
 
452 432
     <p>
453
-    Note: even though it originally came from an acronym, Tor is not
454
-spelled
433
+    Note: even though it originally came from an acronym, Tor is not spelled
455 434
     "TOR". Only the first letter is capitalized. In fact, we can usually
456
-    spot people who haven't read any of our website (and have instead
457
-learned
458
-    everything they know about Tor from news articles) by the fact that
459
-they
435
+    spot people who haven't read any of our website (and have instead learned
436
+    everything they know about Tor from news articles) by the fact that they
460 437
     spell it wrong.
461 438
     </p>
462 439
 
463 440
     <hr>
464 441
 
465 442
     <a id="Backdoor"></a>
466
-    <h3><a class="anchor" href="#Backdoor">Is there a backdoor in
467
-Tor?</a></h3>
443
+    <h3><a class="anchor" href="#Backdoor">Is there a backdoor in Tor?</a></h3>
468 444
 
469 445
     <p>
470 446
     There is absolutely no backdoor in Tor.  We know some smart lawyers
... ...
@@ -474,27 +450,25 @@ Tor?</a></h3>
474 450
     </p>
475 451
 
476 452
     <p>
477
-    We will <a
478
-    href="https://media.ccc.de/v/31c3_-_6251_-_en_-_saal_1_-_201412301400_-_state_of_the_onion_-_jacob_-_arma">never</a>
479
-    put a backdoor in Tor.
480
-    We think that putting a backdoor in Tor would be tremendously
481
-    irresponsible to our users, and a bad precedent for security
482
-    software in general. If we ever put a deliberate backdoor in our
483
-    security software, it would ruin our professional reputations.
484
-    Nobody would trust our software ever again &mdash; for excellent
485
-    reason!
453
+    We will
454
+    <a href="https://media.ccc.de/v/31c3_-_6251_-_en_-_saal_1_-_201412301400_-_state_of_the_onion_-_jacob_-_arma">
455
+    never</a> put a backdoor in Tor.
456
+    We think that putting a backdoor in Tor would be tremendously irresponsible
457
+    to our users, and a bad precedent for security software in general. If we
458
+    ever put a deliberate backdoor in our security software, it would ruin our
459
+    professional reputations.
460
+    Nobody would trust our software ever again &mdash; for excellent reason!
486 461
     </p>
487 462
 
488 463
     <p>
489
-    But that said, there are still plenty of subtle attacks
490
-    people might try. Somebody might impersonate us, or break into our
491
-    computers, or something like that. Tor is open source, and you
492
-    should always check the source (or at least the diffs since the last
493
-    release) for suspicious things. If we (or the distributors) don't
494
-    give you source, that's a sure sign something funny might be going
495
-    on. You should also check the <a href="<page
496
-    docs/verifying-signatures>">PGP signatures</a> on the releases, to
497
-    make sure nobody messed with the distribution sites.
464
+    But that said, there are still plenty of subtle attacks people might try.
465
+    Somebody might impersonate us, or break into our computers, or something
466
+    like that. Tor is open source, and you should always check the source (or
467
+    at least the diffs since the last release) for suspicious things. If we (or
468
+    the distributors) don't give you source, that's a sure sign something funny
469
+    might be going on. You should also check the
470
+    <a href="<page docs/verifying-signatures>">PGP signatures</a> on the
471
+    releases, to make sure nobody messed with the distribution sites.
498 472
     </p>
499 473
 
500 474
     <p>
... ...
@@ -506,8 +480,7 @@ Tor?</a></h3>
506 480
     <hr>
507 481
 
508 482
     <a id="DistributingTor"></a>
509
-    <h3><a class="anchor" href="#DistributingTor">Can I distribute
510
-Tor?</a></h3>
483
+    <h3><a class="anchor" href="#DistributingTor">Can I distribute Tor?</a></h3>
511 484
 
512 485
     <p>
513 486
     Yes.
... ...
@@ -550,8 +523,7 @@ Tor?</a></h3>
550 523
     <hr>
551 524
 
552 525
     <a id="SupportMail"></a>
553
-    <h3><a class="anchor" href="#SupportMail">How can I get
554
-support?</a></h3>
526
+    <h3><a class="anchor" href="#SupportMail">How can I get support?</a></h3>
555 527
 
556 528
     <p>See the <a href="<page about/contact>#support">Support section
557 529
     on the contact page</a>.
... ...
@@ -575,32 +547,24 @@ support?</a></h3>
575 547
     </p>
576 548
 
577 549
     <p>
578
-    Before we answer, though, you should realize that Tor is never going
579
-to
580
-    be blazing fast. Your traffic is bouncing through volunteers'
581
-computers
582
-    in various parts of the world, and some bottlenecks and network
583
-latency
550
+    Before we answer, though, you should realize that Tor is never going to
551
+    be blazing fast. Your traffic is bouncing through volunteers' computers
552
+    in various parts of the world, and some bottlenecks and network latency
584 553
     will always be present. You shouldn't expect to see university-style
585 554
     bandwidth through Tor.
586 555
     </p>
587 556
 
588 557
     <p>
589
-    But that doesn't mean that it can't be improved. The current Tor
590
-network
591
-    is quite small compared to the number of people trying to use it,
592
-and
593
-    many of these users don't understand or care that Tor can't
594
-currently
558
+    But that doesn't mean that it can't be improved. The current Tor network
559
+    is quite small compared to the number of people trying to use it, and
560
+    many of these users don't understand or care that Tor can't currently
595 561
     handle file-sharing traffic load.
596 562
     </p>
597 563
 
598 564
     <p>
599
-    For the much more in-depth answer, see <a
600
-    href="<blog>why-tor-is-slow">Roger's blog
601
-    post on the topic</a>, which includes both a detailed PDF and a
602
-video
603
-    to go with it.
565
+    For the much more in-depth answer, see
566
+    <a href="<blog>why-tor-is-slow">Roger's blog post on the topic</a>,
567
+    which includes both a detailed PDF and a video to go with it.
604 568
     </p>
605 569
 
606 570
     <p>
... ...
@@ -610,10 +574,8 @@ video
610 574
     <ul>
611 575
 
612 576
     <li>
613
-    <a href="<page docs/tor-doc-relay>">Configure your Tor to relay
614
-traffic
615
-    for others</a>. Help make the Tor network large enough that we can
616
-handle
577
+    <a href="<page docs/tor-doc-relay>">Configure your Tor to relay traffic
578
+    for others</a>. Help make the Tor network large enough that we can handle
617 579
     all the users who want privacy and security on the Internet.
618 580
     </li>
619 581
 
... ...
@@ -625,49 +587,37 @@ handle
625 587
     </li>
626 588
 
627 589
     <li>
628
-    There are some bottlenecks in the current Tor network. Help us
629
-design
630
-    experiments to track down and demonstrate where the problems are,
631
-and
590
+    There are some bottlenecks in the current Tor network. Help us design
591
+    experiments to track down and demonstrate where the problems are, and
632 592
     then we can focus better on fixing them.
633 593
     </li>
634 594
 
635 595
     <li>
636 596
     Tor needs some architectural changes too. One important change is to
637
-    start providing <a href="#EverybodyARelay">better service to people
638
-who
639
-    relay traffic</a>. We're working on this, and we'll finish faster if
640
-we
597
+    start providing <a href="#EverybodyARelay">better service to people who
598
+    relay traffic</a>. We're working on this, and we'll finish faster if we
641 599
     get to spend more time on it.
642 600
     </li>
643 601
 
644 602
     <li>
645
-    Help do other things so we can do the hard stuff. Please take a
646
-moment
647
-    to figure out what your skills and interests are, and then <a
648
-href="<page
649
-    getinvolved/volunteer>">look at our volunteer page</a>.
603
+    Help do other things so we can do the hard stuff. Please take a moment
604
+    to figure out what your skills and interests are, and then
605
+    <a href="<page getinvolved/volunteer>">look at our volunteer page</a>.
650 606
     </li>
651 607
 
652 608
     <li>
653
-    Help find sponsors for Tor. Do you work at a company or government
654
-agency
609
+    Help find sponsors for Tor. Do you work at a company or government agency
655 610
     that uses Tor or has a use for Internet privacy, e.g. to browse the
656
-    competition's websites discreetly, or to connect back to the home
657
-servers
658
-    when on the road without revealing affiliations? If your
659
-organization has
660
-    an interest in keeping the Tor network working, please contact them
661
-about
662
-    supporting Tor. Without sponsors, Tor is going to become even
663
-slower.
611
+    competition's websites discreetly, or to connect back to the home servers
612
+    when on the road without revealing affiliations? If your organization has
613
+    an interest in keeping the Tor network working, please contact them about
614
+    supporting Tor. Without sponsors, Tor is going to become even slower.
664 615
     </li>
665 616
 
666 617
     <li>
667 618
     If you can't help out with any of the above, you can still help out
668
-    individually by <a href="<page donate/donate>">donating a bit of
669
-money to the
670
-    cause</a>. It adds up!
619
+    individually by <a href="<page donate/donate>">donating a bit of money to
620
+    the cause</a>. It adds up!
671 621
     </li>
672 622
 
673 623
     </ul>
... ...
@@ -682,71 +632,58 @@ money to the
682 632
     File sharing (peer-to-peer/P2P) is widely unwanted in the Tor network,
683 633
     and exit nodes are configured to block file sharing traffic by default.
684 634
     Tor is not really designed for it, and file sharing through Tor slows
685
-    down everyone's browsing. Also, Bittorrent over Tor <a
686
-    href="https://blog.torproject.org/blog/bittorrent-over-tor-isnt-good-idea">
635
+    down everyone's browsing. Also, Bittorrent over Tor
636
+    <a href="https://blog.torproject.org/blog/bittorrent-over-tor-isnt-good-idea">
687 637
     is not anonymous</a>!
688 638
     </p>
689 639
 
690 640
     <hr>
691 641
 
692 642
     <a id="Funding"></a>
693
-    <h3><a class="anchor" href="#Funding">What would The Tor Project do
694
-with more funding?</a></h3>
643
+    <h3><a class="anchor" href="#Funding">What would The Tor Project do with
644
+    more funding?</a></h3>
695 645
 
696 646
     <p>
697
-    The Tor network's <a
698
-href="https://metrics.torproject.org/networksize.html">several thousand</a>
699
-    relays push <a
700
-href="https://metrics.torproject.org/bandwidth.html">around 100 Gbps on
701
-average</a>. We have <a
702
-href="https://metrics.torproject.org/userstats-relay-country.html">millions of
703
-    daily users</a>. But the Tor network is not yet self-sustaining.
647
+    The Tor network's
648
+    <a href="https://metrics.torproject.org/networksize.html">several thousand
649
+    </a> relays push <a href="https://metrics.torproject.org/bandwidth.html">
650
+    around 100 Gbps on average</a>. We have
651
+    <a href="https://metrics.torproject.org/userstats-relay-country.html">
652
+    millions of daily users</a>. But the Tor network is not yet self-sustaining.
704 653
     </p>
705 654
 
706 655
     <p>
707
-    There are six main development/maintenance pushes that need
708
-attention:
656
+    There are six main development/maintenance pushes that need attention:
709 657
     </p>
710 658
 
711 659
     <ul>
712 660
 
713 661
     <li>
714
-    Scalability: We need to keep scaling and decentralizing the Tor
715
-    architecture so it can handle thousands of relays and millions of
716
-    users. The upcoming stable release is a major improvement, but
717
-there's
718
-    lots more to be done next in terms of keeping Tor fast and stable.
662
+    Scalability: We need to keep scaling and decentralizing the Tor architecture
663
+    so it can handle thousands of relays and millions of users. The upcoming
664
+    stable release is a major improvement, but there's lots more to be done next
665
+    in terms of keeping Tor fast and stable.
719 666
     </li>
720 667
 
721 668
     <li>
722
-    User support: With this many users, a lot of people are asking
723
-questions
724
-    all the time, offering to help out with things, and so on. We need
725
-good
726
-    clean docs, and we need to spend some effort coordinating
727
-volunteers.
669
+    User support: With this many users, a lot of people are asking questions
670
+    all the time, offering to help out with things, and so on. We need good
671
+    clean docs, and we need to spend some effort coordinating volunteers.
728 672
     </li>
729 673
 
730 674
     <li>
731
-    Relay support: the Tor network is run by volunteers, but they still
732
-need
675
+    Relay support: the Tor network is run by volunteers, but they still need
733 676
     attention with prompt bug fixes, explanations when things go wrong,
734
-    reminders to upgrade, and so on. The network itself is a commons,
735
-and
736
-    somebody needs to spend some energy making sure the relay operators
737
-stay
738
-    happy. We also need to work on stability on some platforms &mdash;
739
-e.g.,
677
+    reminders to upgrade, and so on. The network itself is a commons, and
678
+    somebody needs to spend some energy making sure the relay operators stay
679
+    happy. We also need to work on stability on some platforms &mdash; e.g.,
740 680
     Tor relays have problems on Win XP currently.
741 681
     </li>
742 682
 
743 683
     <li>
744
-    Usability: Beyond documentation, we also need to work on usability
745
-of the
746
-    software itself. This includes installers, clean GUIs, easy
747
-configuration
748
-    to interface with other applications, and generally automating all
749
-of
684
+    Usability: Beyond documentation, we also need to work on usability of the
685
+    software itself. This includes installers, clean GUIs, easy configuration
686
+    to interface with other applications, and generally automating all of
750 687
     the difficult and confusing steps inside Tor.
751 688
     Usability for privacy software has never been easy.
752 689
     </li>
... ...
@@ -754,22 +691,18 @@ of
754 691
     <li>
755 692
     Incentives: We need to work on ways to encourage people to configure
756 693
     their Tors as relays and exit nodes rather than just clients.
757
-    <a href="#EverybodyARelay">We need to make it easy to become a
758
-relay,
694
+    <a href="#EverybodyARelay">We need to make it easy to become a relay,
759 695
     and we need to give people incentives to do it.</a>
760 696
     </li>
761 697
 
762 698
     <li>
763
-    Research: The anonymous communications field is full
764
-    of surprises and gotchas. In our copious free time, we
765
-    also help run top anonymity and privacy conferences like <a
766
-    href="http://petsymposium.org/">PETS</a>. We've identified a set of
767
-    critical <a href="<page getinvolved/volunteer>#Research">Tor
768
-research questions</a>
769
-    that will help us figure out how to make Tor secure against the
770
-variety of
771
-    attacks out there. Of course, there are more research questions
772
-waiting
699
+    Research: The anonymous communications field is full of surprises and
700
+    gotchas. In our copious free time, we also help run top anonymity and
701
+    privacy conferences like <a href="http://petsymposium.org/">PETS</a>.
702
+    We've identified a set of critical
703
+    <a href="<page getinvolved/volunteer>#Research">Tor research questions</a>
704
+    that will help us figure out how to make Tor secure against the variety of
705
+    attacks out there. Of course, there are more research questions waiting
773 706
     behind these.
774 707
     </li>
775 708
 
... ...
@@ -777,11 +710,9 @@ waiting
777 710
 
778 711
     <p>
779 712
     We're continuing to move forward on all of these, but at this rate
780
-    <a href="#WhySlow">the Tor network is growing faster than the
781
-developers
713
+    <a href="#WhySlow">the Tor network is growing faster than the developers
782 714
     can keep up</a>.
783
-    Now would be an excellent time to add a few more developers to the
784
-effort
715
+    Now would be an excellent time to add a few more developers to the effort
785 716
     so we can continue to grow the network.
786 717
     </p>
787 718
 
... ...
@@ -791,22 +722,17 @@ effort
791 722
     </p>
792 723
 
793 724
     <p>
794
-    We are proud to have <a href="<page about/sponsors>">sponsorship and
795
-support</a>
796
-    from the Omidyar Network, the International Broadcasting Bureau,
797
-Bell
798
-    Security Solutions, the Electronic Frontier Foundation, several
799
-government
800
-    agencies and research groups, and hundreds of private contributors.
725
+    We are proud to have
726
+    <a href="<page about/sponsors>">sponsorship and support</a> from the Omidyar
727
+    Network, the International Broadcasting Bureau, Bell Security Solutions,
728
+    the Electronic Frontier Foundation, several government agencies and research
729
+    groups, and hundreds of private contributors.
801 730
     </p>
802 731
 
803 732
     <p>
804
-    However, this support is not enough to keep Tor abreast of changes
805
-in the
806
-    Internet privacy landscape. Please <a href="<page
807
-donate/donate>">donate</a>
808
-    to the project, or <a href="<page about/contact>">contact</a> our
809
-executive
733
+    However, this support is not enough to keep Tor abreast of changes in the
734
+    Internet privacy landscape. Please <a href="<page donate/donate>">donate</a>
735
+    to the project, or <a href="<page about/contact>">contact</a> our executive
810 736
     director for information on making grants or major donations.
811 737
     </p>
812 738
 
... ...
@@ -827,8 +753,8 @@ executive
827 753
     <hr>
828 754
 
829 755
     <a id="OutboundPorts"></a>
830
-    <h3><a class="anchor" href="#OutboundPorts">Which outbound ports must be open when
831
-    using Tor as a client?</a></h3>
756
+    <h3><a class="anchor" href="#OutboundPorts">Which outbound ports must be
757
+    open when using Tor as a client?</a></h3>
832 758
     <p>
833 759
     Tor may attempt to connect to any port that is advertised in the
834 760
     directory as an ORPort (for making Tor connections) or a DirPort (for
... ...
@@ -837,11 +763,11 @@ executive
837 763
     ports too.
838 764
     </p>
839 765
     <p>
840
-    When using Tor as a client, you could probably get away with opening only those four
841
-    ports. Since Tor does all its connections in the background, it will retry
842
-    ones that fail, and hopefully you'll never have to know that it failed, as
843
-    long as it finds a working one often enough. However, to get the most
844
-    diversity in your entry nodes &mdash; and thus the most security
766
+    When using Tor as a client, you could probably get away with opening only
767
+    those four ports. Since Tor does all its connections in the background, it
768
+    will retry ones that fail, and hopefully you'll never have to know that it
769
+    failed, as long as it finds a working one often enough. However, to get the
770
+    most diversity in your entry nodes &mdash; and thus the most security
845 771
     &mdash; as well as the most robustness in your connectivity, you'll
846 772
     want to let it connect to all of them.
847 773
     See the FAQ entry on <a href="#FirewallPorts">firewalled ports</a> if
... ...
@@ -857,8 +783,9 @@ executive
857 783
 
858 784
     <p>
859 785
     There are sites you can visit that will tell you if you appear to be
860
-    coming through the Tor network. Try the <a href="https://check.torproject.org">
861
-    Tor Check</a> site and see whether it thinks you are using Tor or not.
786
+    coming through the Tor network. Try the
787
+    <a href="https://check.torproject.org">Tor Check</a> site and see whether
788
+    it thinks you are using Tor or not.
862 789
     </p>
863 790
 
864 791
     <hr>
... ...
@@ -902,95 +829,89 @@ executive
902 829
     <hr>
903 830
 
904 831
     <a id="CompilationAndInstallation"></a>
905
-    <h2><a class="anchor" href="#CompilationAndInstallation">Compilation And Installation:</a></h2>
832
+    <h2><a class="anchor" href="#CompilationAndInstallation">Compilation And
833
+    Installation:</a></h2>
906 834
 
907 835
     <a id="HowUninstallTor"></a>
908
-    <h3><a class="anchor" href="#HowUninstallTor">How do I uninstall
909
-Tor?</a></h3>
836
+    <h3><a class="anchor" href="#HowUninstallTor">How do I uninstall Tor?
837
+    </a></h3>
910 838
 
911 839
     <p>
912
-    Tor Browser does not install itself in the classic sense of
913
-applications. You just simply delete the folder or directory named "Tor
914
-Browser" and it is removed from your system.
840
+    Tor Browser does not install itself in the classic sense of applications.
841
+    You just simply delete the folder or directory named "Tor Browser" and it
842
+    is removed from your system.
915 843
     </p>
916 844
 
917 845
     <p>
918
-    If this is not related to Tor Browser, uninstallation depends
919
-entirely on how you installed it and which operating system you
920
-    have. If you installed a package, then hopefully your package has a
921
-way to
922
-    uninstall itself. The Windows packages include uninstallers.
846
+    If this is not related to Tor Browser, uninstallation depends entirely on