commit 8dc3ae194e9b4fbc1cabf93c2521ff0c65567005 Author: hiromipaw hiro@torproject.org Date: Thu Sep 7 19:28:57 2017 +0200
Adding homebrew instruction for tor on OSX --- docs/en/tor-doc-osx.wml | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/docs/en/tor-doc-osx.wml b/docs/en/tor-doc-osx.wml index 454efa9f..2d31d5dc 100644 --- a/docs/en/tor-doc-osx.wml +++ b/docs/en/tor-doc-osx.wml @@ -25,20 +25,34 @@ 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 Macports</a></h2> + <h2><a class="anchor" href="#installing">Step One: Install A Package Manager</a></h2> <br>
+ <p>There are two package manager on OS X: Homebrew and Macports. You can use the package manager of your choice.</p> + <p> - 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. + To install Homebrew follow the instructions on <a + href="https://brew.sh/%22%3Ebrew.sh</a>. + </p> + + <p> + To install Macports follow the instructions on <a + href="https://www.macports.org/install.php%22%3Emacports.org/install.php</a>. </p>
<hr> <h2>Step Two: Install Tor</a></h2> <br>
- <p>In a Terminal window, run:</p> + <p>If you are using Homebrw in a Terminal window, run:</p> + + <pre>brew install tor</pre> + + <p>You will find a sample Tor configuration file at + <tt>/usr/local/etc/tor/torrc.sample</tt>. Remove the .sample extension to + make it effective.</p> + + <p>If you are using Macports in a Terminal window, run:</p>
<pre>sudo port install tor</pre>