[tor-commits] r26618: {website} Clarified torrc entry. (website/trunk/docs/en)
Matt Pagan
matt at pagan.io
Thu Feb 20 20:27:09 UTC 2014
Author: mttp
Date: 2014-02-20 20:27:09 +0000 (Thu, 20 Feb 2014)
New Revision: 26618
Modified:
website/trunk/docs/en/faq.wml
Log:
Clarified torrc entry.
Modified: website/trunk/docs/en/faq.wml
===================================================================
--- website/trunk/docs/en/faq.wml 2014-02-18 18:09:56 UTC (rev 26617)
+++ website/trunk/docs/en/faq.wml 2014-02-20 20:27:09 UTC (rev 26618)
@@ -14,8 +14,21 @@
<h1>Tor FAQ</h1>
<hr>
- <p><a href="#General">General questions:</a></p>
+ <p><a href="#General">General questions:</a><br />
+ <a href="#CompilationAndInstallation">Compilation and Installation:</a><br />
+ <a href="#TBBGeneral">Tor Browser Bundle (general):</a><br />
+ <p>Tor Browser Bundle (3.x series):</p>
+ <a href="#AdvancedTorUsage">Advanced Tor usage:</a><br />
+ <a href="#RunningATorRelay">Running a Tor relay:</a><br />
+ <a href="#TorHiddenServices">Tor hidden services:</a><br />
+ <a href="#Development">Development:</a><br />
+ <a href="#AnonymityAndSecurity">Anonymity and Security:</a><br />
+ <a href="#AlternateDesigns">Alternate designs that we don't do (yet):</a><br />
+ <a href="#Abuse">Abuse:</a></p>
+<hr>
+
+ <p>General questions:</p>
<ul>
<li><a href="#WhatIsTor">What is Tor?</a></li>
<li><a href="#Torisdifferent">How is Tor different from other
@@ -45,7 +58,7 @@
fingerprints?</a></li>
</ul>
- <p><a href="#CompilationAndInstallation">Compilation and Installation:</a></p>
+ <p>Compilation and Installation:</p>
<ul>
<li><a href="#HowUninstallTor">How do I uninstall Tor?</a></li>
@@ -53,8 +66,6 @@
page?</a></li>
<li><a href="#GetTor">Your website is blocked in my country. How
do I download Tor?</a></li>
- <li><a href="#CompileTorWindows">How do I compile Tor under
-Windows?</a></li>
<li><a href="#VirusFalsePositives">Why does my Tor executable appear to
have a virus or spyware?</a></li>
<li><a href="#tarballs">How do I open a .tar.gz or .tar.xz file?</a></li>
@@ -62,7 +73,7 @@
includes Tor?</a></li>
</ul>
- <p><a href="#TBBGeneral">Tor Browser Bundle (general):</a></p>
+ <p>Tor Browser Bundle (general):</p>
<ul>
<li><a href="#TBBFlash">Why can't I view videos on YouTube and other
@@ -101,7 +112,7 @@
with my application?</a></li>
</ul>
- <p><a href="#TBB3.x">Tor Browser Bundle (3.x series):</a></p>
+ <p>Tor Browser Bundle (3.x series):</p>
<ul>
<li><a href="#WhereDidVidaliaGo">Where did the world map (Vidalia)
@@ -119,7 +130,7 @@
I verify a build?</a></li>
</ul>
- <p><a href="#AdvancedTorUsage">Advanced Tor usage:</a></p>
+ <p>Advanced Tor usage:</p>
<ul>
<li><a href="#torrc">I'm supposed to "edit my torrc". What does
@@ -145,7 +156,7 @@
SOCKS is leaking DNS requests?</a></li>
</ul>
- <p><a href="#RunningATorRelay">Running a Tor relay:</a></p>
+ <p>Running a Tor relay:</p>
<ul>
<li><a href="#HowDoIDecide">How do I decide if I should run a relay?
@@ -206,14 +217,14 @@
run my own?</a></li>
</ul>
- <p><a href="#TorHiddenServices">Tor hidden services:</a></p>
+ <p>Tor hidden services:</p>
<ul>
<li><a href="#AccessHiddenServices">How do I access hidden services?</a></li>
<li><a href="#ProvideAHiddenService">How do I provide a hidden service?</a></li>
</ul>
- <p><a href="#Development">Development:</a></p>
+ <p>Development:</p>
<ul>
<li><a href="#WhoIsResponsible">Who is responsible for Tor?</a></li>
@@ -228,7 +239,7 @@
into Tor?</a></li>
</ul>
- <p><a href="#AnonymityAndSecurity">Anonymity and Security:</a></p>
+ <p>Anonymity and Security:</p>
<ul>
<li><a href="#WhatProtectionsDoesTorProvide">What protections does Tor
provide?</a></li>
@@ -258,7 +269,7 @@
<li><a href="#LearnMoreAboutAnonymity">Where can I learn more about anonymity?</a></li>
</ul>
- <p><a href="#AlternateDesigns">Alternate designs that we don't do (yet):</a></p>
+ <p>Alternate designs that we don't do (yet):</p>
<ul>
<li><a href="#EverybodyARelay">You should make every Tor user be a
@@ -289,7 +300,7 @@
<li><a href="#IPv6">Tor should support IPv6.</a></li>
</ul>
- <p><a href="#Abuse">Abuse:</a></p>
+ <p>Abuse:</p>
<ul>
<li><a href="#Criminals">Doesn't Tor enable criminals to do bad
things?</a></li>
@@ -1087,53 +1098,8 @@
other than our official HTTPS website.
</p>
-<hr>
-
- <a id="CompileTorWindows"></a>
- <h3><a class="anchor" href="#CompileTorWindows">How do I compile Tor
-under Windows?</a></h3>
-
- <p>
- Try following the steps at <a
-href="<gitblob>doc/tor-win32-mingw-creation.txt">
- tor-win32-mingw-creation.txt</a>.
- </p>
-
- <p>
- (Note that you don't need to compile Tor yourself in order to use
- it. Most people just use the packages available on the <a
-href="<page
- download/download>">download page</a>.)
- </p>
-
<hr>
- <a id="VirusFalsePositives"></a>
- <h3><a class="anchor" href="#VirusFalsePositives">Why does my Tor
-executable appear to have a virus or spyware?</a></h3>
-
- <p>
- Sometimes, overzealous Windows virus and spyware detectors trigger
-on some
- parts of the Tor Windows binary. Our best guess is that these are
-false
- positives — after all, the anti-virus and anti-spyware
-business is just a
- guessing game anyway. You should contact your vendor and explain
-that you have
- a program that seems to be triggering false positives. Or pick a
-better vendor.
- </p>
-
- <p>
- In the meantime, we encourage you to not just take our word for
- it. Our job is to provide the source; if you're concerned, please do
-<a
- href="#CompileTorWindows">recompile it yourself</a>.
- </p>
-
- <hr>
-
<a id="tarballs"></a>
<h3><a class="anchor" href="#tarballs">How do I open a .tar.gz
or .tar.xz file?</a></h3>
@@ -1876,6 +1842,9 @@
<p>
If you installed Tor Browser Bundle, look for
<code>Data/Tor/torrc</code> inside your Tor Browser Bundle directory.
+On OS X, you must right-click or command-click on the browser bundle icon,
+and select "Show Package Contents" before the Tor Browser directories become
+visible.
</p>
<p>
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>
More information about the tor-commits
mailing list