Clarified torrc entry.
Matt Pagan

Matt Pagan commited on 2014-02-20 21:27:09
Zeige 1 geänderte Dateien mit 27 Einfügungen und 58 Löschungen.

... ...
@@ -14,8 +14,21 @@
14 14
     <h1>Tor FAQ</h1>
15 15
     <hr>
16 16
 
17
-    <p><a href="#General">General questions:</a></p>
17
+    <p><a href="#General">General questions:</a><br />
18
+    <a href="#CompilationAndInstallation">Compilation and Installation:</a><br />
19
+    <a href="#TBBGeneral">Tor Browser Bundle (general):</a><br />
20
+    <p>Tor Browser Bundle (3.x series):</p>
21
+    <a href="#AdvancedTorUsage">Advanced Tor usage:</a><br />
22
+    <a href="#RunningATorRelay">Running a Tor relay:</a><br />
23
+    <a href="#TorHiddenServices">Tor hidden services:</a><br />
24
+    <a href="#Development">Development:</a><br />
25
+    <a href="#AnonymityAndSecurity">Anonymity and Security:</a><br />
26
+    <a href="#AlternateDesigns">Alternate designs that we don't do (yet):</a><br />
27
+    <a href="#Abuse">Abuse:</a></p>
18 28
 
29
+<hr>
30
+
31
+    <p>General questions:</p>
19 32
     <ul>
20 33
     <li><a href="#WhatIsTor">What is Tor?</a></li>
21 34
     <li><a href="#Torisdifferent">How is Tor different from other
... ...
@@ -45,7 +58,7 @@ proxies?</a></li>
45 58
     fingerprints?</a></li>
46 59
     </ul>
47 60
 
48
-    <p><a href="#CompilationAndInstallation">Compilation and Installation:</a></p>
61
+    <p>Compilation and Installation:</p>
49 62
 
50 63
     <ul>
51 64
     <li><a href="#HowUninstallTor">How do I uninstall Tor?</a></li>
... ...
@@ -53,8 +66,6 @@ proxies?</a></li>
53 66
     page?</a></li>
54 67
     <li><a href="#GetTor">Your website is blocked in my country. How
55 68
     do I download Tor?</a></li>
56
-    <li><a href="#CompileTorWindows">How do I compile Tor under
57
-Windows?</a></li>
58 69
     <li><a href="#VirusFalsePositives">Why does my Tor executable appear to
59 70
     have a virus or spyware?</a></li>
60 71
     <li><a href="#tarballs">How do I open a .tar.gz or .tar.xz file?</a></li>
... ...
@@ -62,7 +73,7 @@ Windows?</a></li>
62 73
 includes Tor?</a></li>
63 74
     </ul>
64 75
 
65
-    <p><a href="#TBBGeneral">Tor Browser Bundle (general):</a></p>
76
+    <p>Tor Browser Bundle (general):</p>
66 77
     <ul>
67 78
 
68 79
     <li><a href="#TBBFlash">Why can't I view videos on YouTube and other
... ...
@@ -101,7 +112,7 @@ unsafe?</a></li>
101 112
     with my application?</a></li>
102 113
     </ul>
103 114
 
104
-    <p><a href="#TBB3.x">Tor Browser Bundle (3.x series):</a></p>
115
+    <p>Tor Browser Bundle (3.x series):</p>
105 116
 
106 117
     <ul>
107 118
     <li><a href="#WhereDidVidaliaGo">Where did the world map (Vidalia) 
... ...
@@ -119,7 +130,7 @@ unsafe?</a></li>
119 130
     I verify a build?</a></li>
120 131
     </ul>
121 132
 
122
-    <p><a href="#AdvancedTorUsage">Advanced Tor usage:</a></p>
133
+    <p>Advanced Tor usage:</p>
123 134
 
124 135
     <ul>
125 136
     <li><a href="#torrc">I'm supposed to "edit my torrc". What does
... ...
@@ -145,7 +156,7 @@ country)
145 156
     SOCKS is leaking DNS requests?</a></li>
146 157
     </ul>
147 158
 
148
-    <p><a href="#RunningATorRelay">Running a Tor relay:</a></p>
159
+    <p>Running a Tor relay:</p>
149 160
     <ul>
150 161
 
151 162
     <li><a href="#HowDoIDecide">How do I decide if I should run a relay?
... ...
@@ -206,14 +217,14 @@ relay.</a></li>
206 217
     run my own?</a></li>
207 218
     </ul>
208 219
 
209
-    <p><a href="#TorHiddenServices">Tor hidden services:</a></p>
220
+    <p>Tor hidden services:</p>
210 221
 
211 222
     <ul>
212 223
     <li><a href="#AccessHiddenServices">How do I access hidden services?</a></li>
213 224
     <li><a href="#ProvideAHiddenService">How do I provide a hidden service?</a></li>
214 225
     </ul>
215 226
 
216
-    <p><a href="#Development">Development:</a></p>
227
+    <p>Development:</p>
217 228
 
218 229
     <ul>
219 230
     <li><a href="#WhoIsResponsible">Who is responsible for Tor?</a></li>
... ...
@@ -228,7 +239,7 @@ relay.</a></li>
228 239
     into Tor?</a></li>
229 240
     </ul>
230 241
 
231
-    <p><a href="#AnonymityAndSecurity">Anonymity and Security:</a></p>
242
+    <p>Anonymity and Security:</p>
232 243
     <ul>
233 244
     <li><a href="#WhatProtectionsDoesTorProvide">What protections does Tor 
234 245
     provide?</a></li>
... ...
@@ -258,7 +269,7 @@ uses.</a></li>
258 269
     <li><a href="#LearnMoreAboutAnonymity">Where can I learn more about anonymity?</a></li>
259 270
     </ul>
260 271
 
261
-    <p><a href="#AlternateDesigns">Alternate designs that we don't do (yet):</a></p>
272
+    <p>Alternate designs that we don't do (yet):</p>
262 273
 
263 274
     <ul>
264 275
     <li><a href="#EverybodyARelay">You should make every Tor user be a
... ...
@@ -289,7 +300,7 @@ packets,
289 300
     <li><a href="#IPv6">Tor should support IPv6.</a></li>
290 301
     </ul>
291 302
 
292
-    <p><a href="#Abuse">Abuse:</a></p>
303
+    <p>Abuse:</p>
293 304
     <ul>
294 305
     <li><a href="#Criminals">Doesn't Tor enable criminals to do bad
295 306
 things?</a></li>
... ...
@@ -1087,51 +1098,6 @@ of any package you download, especially when you get it from somewhere
1087 1098
 other than our official HTTPS website.
1088 1099
 </p>
1089 1100
 
1090
-<hr>
1091
-
1092
-    <a id="CompileTorWindows"></a>
1093
-    <h3><a class="anchor" href="#CompileTorWindows">How do I compile Tor
1094
-under Windows?</a></h3>
1095
-
1096
-    <p>
1097
-    Try following the steps at <a
1098
-href="<gitblob>doc/tor-win32-mingw-creation.txt">
1099
-    tor-win32-mingw-creation.txt</a>.
1100
-    </p>
1101
-
1102
-    <p>
1103
-    (Note that you don't need to compile Tor yourself in order to use
1104
-    it. Most people just use the packages available on the <a
1105
-href="<page
1106
-    download/download>">download page</a>.)
1107
-    </p>
1108
-
1109
-    <hr>
1110
-
1111
-    <a id="VirusFalsePositives"></a>
1112
-    <h3><a class="anchor" href="#VirusFalsePositives">Why does my Tor
1113
-executable appear to have a virus or spyware?</a></h3>
1114
-
1115
-    <p>
1116
-    Sometimes, overzealous Windows virus and spyware detectors trigger
1117
-on some
1118
-    parts of the Tor Windows binary. Our best guess is that these are
1119
-false
1120
-    positives &mdash; after all, the anti-virus and anti-spyware
1121
-business is just a
1122
-    guessing game anyway. You should contact your vendor and explain
1123
-that you have
1124
-    a program that seems to be triggering false positives. Or pick a
1125
-better vendor.
1126
-    </p>
1127
-
1128
-    <p>
1129
-    In the meantime, we encourage you to not just take our word for
1130
-    it. Our job is to provide the source; if you're concerned, please do
1131
-<a
1132
-    href="#CompileTorWindows">recompile it yourself</a>.
1133
-    </p>
1134
-
1135 1101
     <hr>
1136 1102
 
1137 1103
     <a id="tarballs"></a>
... ...
@@ -1876,6 +1842,9 @@ configuration should work fine for most Tor users.
1876 1842
 <p>
1877 1843
 If you installed Tor Browser Bundle, look for
1878 1844
 <code>Data/Tor/torrc</code> inside your Tor Browser Bundle directory. 
1845
+On OS X, you must right-click or command-click on the browser bundle icon, 
1846
+and select "Show Package Contents" before the Tor Browser directories become 
1847
+visible. 
1879 1848
 </p>
1880 1849
 <p>
1881 1850
 Tor puts the torrc file in <code>/usr/local/etc/tor/torrc</code> if you compiled tor from source, and <code>/etc/tor/torrc</code> or <code>/etc/torrc</code> if you installed a pre-built package.</p>
1882 1851