Browse code

don't tell users how to kill their anonymity to watch cat videos on the internet.

Andrew Lewman authored on 26/03/2013 12:38:41
Showing 1 changed files
... ...
@@ -73,7 +73,7 @@ configure NoScript to block JavaScript by default?</a></li>
73 73
     <li><a href="#TBBCloseBrowser">I want to leave Tor Browser Bundle
74 74
     running but close the browser.</a></li>
75 75
 
76
-    <li><a href="#GoogleCaptcha">Google makes me solve a Captcha or
76
+    <li><a href="#GoogleCaptcha">Google makes me solve a CAPTCHA or
77 77
 tells
78 78
     me I have spyware installed.</a></li>
79 79
     <li><a href="#GmailWarning">Gmail warns me that my account may have
... ...
@@ -498,12 +498,7 @@ or the
498 498
     <p>Not yet, but we're working on it. Most forum software is
499 499
     a disaster to maintain and keep secure, and at the same time
500 500
     too many of the Tor developers are spread too thin to be able
501
-    to contribute enough to a forum. As of June 2012, we have a
502
-    funder who wants to help us do it right. Stay tuned! (Tickets <a
503
-    href="https://trac.torproject.org/projects/tor/ticket/3592">3592</a>
504
-    and <a
505
-    href="https://trac.torproject.org/projects/tor/ticket/5995">5995</a>
506
-    relate to forums too.)
501
+    to contribute enough to a forum.
507 502
     </p>
508 503
 
509 504
     <hr>
... ...
@@ -956,30 +951,11 @@ secure, transparent proxy to protect you from proxy bypass, however issues
956 951
 with local IP address discovery and Flash cookies still remain.  </p>
957 952
 
958 953
 <p>
959
-<a href="https://www.youtube.com/html5">YouTube offers experimental HTML5 video 
960
-support</a> for many of their videos. You can use their Advanced Search to 
954
+<a href="https://www.youtube.com/html5">YouTube offers experimental HTML5 video
955
+support</a> for many of their videos. You can use their Advanced Search to
961 956
 find HTML5 videos.
962 957
 </p>
963 958
 
964
-<p>
965
-If you are not concerned about being tracked by these sites (and sites that
966
-try to unmask you by pretending to be them), and are unconcerned about your
967
-local censors potentially noticing you visit them, you can enable plugins by
968
-going into the Torbutton Preferences -&gt; Security Settings
969
-tab and unchecking "Disable browser plugins (such as Flash)" box. If you do this
970
-without The Amnesic Incognito Live System or appropriate firewall
971
-rules, we strongly suggest you at least use <a
972
-href="https://addons.mozilla.org/en-US/firefox/addon/722">NoScript</a> to <a
973
-href="http://noscript.net/features#contentblocking">block plugins</a>. You do
974
-not need to use the NoScript per-domain permissions if you check the <b>Apply
975
-these restrictions to trusted sites too</b> option under the NoScript Plugins
976
-preference tab. In fact, with this setting you can even have NoScript allow
977
-Javascript globally, but still block all plugins until you click on their
978
-placeholders in a page. We also recommend <a
979
-href="https://addons.mozilla.org/en-US/firefox/addon/6623">Better Privacy</a>
980
-in this case to help you clear your Flash cookies.
981
-</p>
982
-
983 959
 <hr>
984 960
 
985 961
 <a id="TBBSocksPort"></a>
... ...
@@ -989,12 +965,12 @@ Browser Bundle.</a></h3>
989 965
 
990 966
 <p>
991 967
 Typically Tor listens for Socks connections on port 9050. TBB listens
992
-on port 9150. 
968
+on port 9150.
993 969
 The goal is to avoid conflicting with a "system" Tor install,
994 970
 so you can run a system Tor and TBB at the same time. We're <a
995 971
 href="https://trac.torproject.org/projects/tor/ticket/3948">working on
996 972
 a feature</a> where Tor will try the usual ports first and then back
997
-off to a random choice if they're already in use. 
973
+off to a random choice if they're already in use.
998 974
 </p>
999 975
 
1000 976
 <hr>
... ...
@@ -1044,8 +1020,8 @@ its name).
1044 1020
 </p>
1045 1021
 
1046 1022
 <p>
1047
-Generally, extensions that require registration, and/or provide 
1048
-additional information about websites you are visiting, should be 
1023
+Generally, extensions that require registration, and/or provide
1024
+additional information about websites you are visiting, should be
1049 1025
 suspect.
1050 1026
 </p>
1051 1027
 
... ...
@@ -1058,7 +1034,7 @@ Extensions you might like include
1058 1034
  <a href="https://addons.mozilla.org/firefox/addon/82">Cookie Culler</a>,
1059 1035
  <a href="https://addons.mozilla.org/en-US/firefox/addon/9727/">Request Policy</a> and
1060 1036
  <a href="https://addons.mozilla.org/en-US/firefox/addon/certificate-patrol/">Certificate Patrol</a>.
1061
-</p> 
1037
+</p>
1062 1038
 
1063 1039
 <hr>
1064 1040
 
... ...
@@ -1680,7 +1656,7 @@ relay or bridge relay?</a></h3>
1680 1656
 short)
1681 1657
     are <a href="<page docs/tor-doc-relay>">Tor relays</a> that aren't
1682 1658
     listed in the public Tor directory.
1683
-    That means that ISPs or governments trying to block access to the 
1659
+    That means that ISPs or governments trying to block access to the
1684 1660
     Tor network can't simply block all bridges.
1685 1661
     </p>
1686 1662
 
... ...
@@ -1690,7 +1666,7 @@ short)
1690 1666
     </p>
1691 1667
 
1692 1668
     <p>
1693
-    So bridges are useful a) for Tor users in oppressive regimes, 
1669
+    So bridges are useful a) for Tor users in oppressive regimes,
1694 1670
     and b) for people who want an extra layer of security
1695 1671
     because they're worried somebody will recognize that it's a public
1696 1672
     Tor relay IP address they're contacting.
... ...
@@ -1698,9 +1674,9 @@ short)
1698 1674
 
1699 1675
     <p>
1700 1676
     Several countries, including China and Iran, have found ways to
1701
-    detect and block connections to Tor bridges. 
1677
+    detect and block connections to Tor bridges.
1702 1678
     <a href="<page projects/obfsproxy>">Obfsproxy</a> bridges address
1703
-    this by adding another layer of obfuscation. 
1679
+    this by adding another layer of obfuscation.
1704 1680
     </p>
1705 1681
 
1706 1682
     <p>So should you run a normal relay or bridge relay? If you have