commit 9fcd16f2c32c4d69ba70935f8de956bcafd0e563 Author: Sebastian Hahn sebastian@torproject.org Date: Wed Feb 11 08:08:38 2015 +0100
Rewrite OS X document to refer to macports --- docs/en/tor-doc-osx.wml | 70 ++++++++++++++++++----------------------------- 1 file changed, 27 insertions(+), 43 deletions(-)
diff --git a/docs/en/tor-doc-osx.wml b/docs/en/tor-doc-osx.wml index 9f280e1..6840b4b 100644 --- a/docs/en/tor-doc-osx.wml +++ b/docs/en/tor-doc-osx.wml @@ -19,58 +19,53 @@ are done. </h2>
- <p>Even though the Tor Browser comes with a regular Tor, and you could use the graphical interface to configure Tor as a relay and bridge easily, it will only run as long as you keep the Tor Browser open. The following instructions will set up Tor without graphical interface or a browser. Many people prefer this over TBB when they host hidden services or relay traffic for other Tor users. - <hr> + <p>Even though the Tor Browser comes with a regular Tor, it will only run + as long as you keep the Tor Browser open. The following instructions will + set up Tor without graphical interface or a browser. Many people prefer + this over TBB when they host hidden services or relay traffic for other Tor + users. <hr> <a id="installing"></a> - <h2><a class="anchor" href="#installing">Step One: Install Homebrew</a></h2> + <h2><a class="anchor" href="#installing">Step One: Install Macports</a></h2> <br>
<p> - The advanced Tor without any graphical user interface can be installed using <a href="http://brew.sh">the Homebrew package manager</a>. It is most suitable if you want to use Tor as a SOCKS proxy for applications other than web browsing, or run a Tor relay/bridge to help other Tor users. If you use the command-line Tor, you might be interested in <a href="<page projects/arm>">arm</a>, a command-line Tor monitor. + Macports is a package manager for Mac OS X which provides a Tor package, + along a lot of other stuff. Follow the instructions on <a + href="https://www.macports.org/install.php%22%3Eits Website</a> to install. </p>
- <p>If you don't have Homebrew installed, open a terminal window and run:</p> - - <pre>ruby -e "$(curl -fsSkL https://raw.githubusercontent.com/Homebrew/install/master/install)"</pre> - <hr> <h2>Step Two: Install Tor</a></h2> <br>
- <p>In a terminal window, run:</p> + <p>In a Terminal window, run:</p>
- <pre>brew install tor</pre> + <pre>sudo port install tor</pre>
- <p>You will find the Tor configuration file at <tt>/usr/local/etc/tor/torrc</tt>.</p> - - <hr> - <a id="verify"></a> - <h2><a class="anchor" href="#verify">Step Three: Verify your download</a></h2> - - <p>As with any application, you should make sure it came unmodified from the orginal source. Unfortunately, Homebrew does not come with integrated verification for downloads, and anyone could submit a modified Tor! Currently, we don't have good instructions on how to verify the Tor download on Mac OSX. If you think you do, please <a href="<page about/contact>">let us know</a>!</p> + <p>You will find a sample Tor configuration file at + <tt>/opt/local/etc/tor/torrc.sample</tt>. Remove the .sample extension to + make it effective.</p>
<hr> <a id="using"></a> - <h2><a class="anchor" href="#using">Step Four: Configure your application to use Tor</a></h2> + <h2><a class="anchor" href="#using">Step Three: Configure your application to use Tor</a></h2>
<p> - If you want to use Tor for anonymous web browsing, please use the <a href="<page projects/torbrowser>">Tor Browser</a>. It comes with readily configured Tor and a browser patched for better anonymity. To use SOCKS directly (for instant messaging, Jabber, IRC, etc), - you can point your application directly at Tor (localhost - port 9050), but see <a href="<wikifaq>#SOCKSAndDNS">this FAQ - entry</a> for why this may be dangerous. For applications - that support neither SOCKS nor HTTP, take a look at <a - href="http://www.dest-unreach.org/socat/%22%3Esocat</a>.</p> + To use SOCKS directly (for instant messaging, Jabber, IRC, etc), you can + point your application directly at Tor (localhost port 9050), but see <a + href="<wikifaq>#SOCKSAndDNS">this FAQ entry</a> for why this may be + dangerous. For applications that support neither SOCKS nor HTTP, take a + look at <a href="http://www.dest-unreach.org/socat/">socat</a>.</p>
<p>For information on how to Torify other applications, check out the <a href="<wiki>doc/TorifyHOWTO">Torify HOWTO</a>. </p>
- <p>If you have a personal firewall that limits your computer's - ability to connect to itself, be sure to allow connections from - your local applications to local port 9050. If your - firewall blocks outgoing connections, punch a hole so it can - connect to at least TCP ports 80 and 443, and then see <a - href="<wikifaq>#FirewalledClient">this FAQ entry</a>. + <p>If you have a personal firewall that limits your computer's ability to + connect to itself, be sure to allow connections from your local + applications to local port 9050. If your firewall blocks outgoing + connections, punch a hole so it can connect to at least TCP ports 80 and + 443, and then see <a href="<wikifaq>#FirewalledClient">this FAQ entry</a>. </p>
<p>If it's still not working, look at <a @@ -100,21 +95,10 @@ values. If you just want to stop using Tor, you can end at this point.</p>
- <p>If you want to completely remove Tor, and your account has Admin - Privileges, then proceed as follows:</p> - - <ol> - <li>Open Finder and click on Applications.</li> - <li>Drag /Applications/TorBrowser to the Trash.</li> - <li>Remove /Library/Torbutton from your system.</li> - </ol> + <p>If you want to completely remove Tor, type into a Terminal window:</p>
- <p>Tor Browser is now completely removed from your system.</p> - - <hr> + <pre>sudo port uninstall tor</pre>
- <p>If you have suggestions for improving this document, please <a - href="<page about/contact>">send them to us</a>. Thanks!</p> </div> <!-- END MAINCOL --> <div id = "sidecol">