diff --git a/source/_static/images/tor/install_homebrew.png b/source/_static/images/tor/install_homebrew.png new file mode 100644 index 0000000..ce397f6 Binary files /dev/null and b/source/_static/images/tor/install_homebrew.png differ diff --git a/source/_static/images/tor/install_homebrew1.png b/source/_static/images/tor/install_homebrew1.png new file mode 100644 index 0000000..a896f9b Binary files /dev/null and b/source/_static/images/tor/install_homebrew1.png differ diff --git a/source/_static/images/tor/install_tor.png b/source/_static/images/tor/install_tor.png new file mode 100644 index 0000000..e60ba4c Binary files /dev/null and b/source/_static/images/tor/install_tor.png differ diff --git a/source/misc-guides/tor-os/linux.rst b/source/misc-guides/tor-os/linux.rst index 59c2d32..3c5ddaa 100644 --- a/source/misc-guides/tor-os/linux.rst +++ b/source/misc-guides/tor-os/linux.rst @@ -4,10 +4,12 @@ Running Tor on Linux ******************** +For Debian and Debian-based systems, such as Ubuntu, Mint, etc. + #. Install the Tor proxy service to your system. To do so, open your terminal and run the following command: .. code-block:: sudo apt update && sudo apt install tor -#. That's it! Your Linux machine is now setup to natively use Tor. \ No newline at end of file +#. That's it! Your Linux machine is now setup to natively use Tor. diff --git a/source/misc-guides/tor-os/mac.rst b/source/misc-guides/tor-os/mac.rst index e051d54..880df34 100644 --- a/source/misc-guides/tor-os/mac.rst +++ b/source/misc-guides/tor-os/mac.rst @@ -4,36 +4,102 @@ Running Tor on MacOS ******************** -#. First, you need to install the Tor proxy service to your system. This will require opening your Terminal. +Install Homebrew +================ -#. To open your terminal, hold the command key ⌘ + spacebar. `Spotlight Search` will appear. Start typing "terminal" and select the program called `Terminal`. +For macOS running on ARM chips (ie. newer macs): +------------------------------------------------ -#. Paste in the following commands and hit . +.. warning:: macOS Homebrew running natively on M1/Apple Silicon/ARM has partial functionality. Therefore, some additional steps are needed to setup Homebrew. - .. code-block:: +#. Open a command line editor (Terminal), and run the following commands: + + .. code-block:: + + softwareupdate --install-rosetta + arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" + +#. Use this command to install packages: + + .. code-block:: + + arch -x86_64 brew install + +For macOS Big Sur/Catalina: +--------------------------- + +1. If you do not have Homebrew installed, follow the installation instructions `here `_. + + TLDR: Open the command line editor (Terminal) and paste the following line: + + .. code-block:: + + /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" + +2. You will be prompted for your system password before installation; proceed with entering your password: + +.. figure:: /_static/images/tor/install_homebrew.png + :width: 80% + :alt: Homebrew installation + + Enter your password + +3. You will be notified which directories Homebrew is going to create, hit :code:`RETURN`: + +.. figure:: /_static/images/tor/install_homebrew1.png + :width: 80% + :alt: Homebrew installation + +Homebrew creates the directories and downloads any other files it needs e.g. “Command Line Tool for Xcode” and “Homebrew”. + +Wait a few minutes while it downloads and installs what it needs. + +.. warning:: Surprisingly, Homebrew uses Google Analytics to collect anonymous usage data. You can deselect the option to share usage data by `opting out `_. + +Install Tor +=========== + +.. warning:: If you have the Tor Browser open, close it and quit the application. + +For macOS with ARM chips +------------------------ + +In the command line type: + + .. code-block:: + + arch -x86_64 brew install tor + +For macOS Big Sur/Catalina: +--------------------------- + +In the command line type: + + .. code-block:: + + brew install tor + + +See the `Tor Project `_ for more details. + +Once it is finished you have the following options: + +.. figure:: /_static/images/tor/install_tor.png + :width: 80% + :alt: Tor installation + + Install Tor + +In the command line type + +.. code-block:: - which brew || /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" - brew install tor brew services start tor -#. When this completes, you should see something like: +or - .. code-block:: +.. code-block:: - ==> Successfully started `tor` (label: homebrew.mxcl.tor) + arch -x86_64 services start tor -#. If you notice issues connecting to Tor websites, try restarting the Tor service. Open the terminal and run: - - .. code-block:: - - brew services restart tor - -#. After running this command, you should see something like: - - .. code-block:: - - Stopping `tor`... (might take a while) - ==> Successfully stopped `tor` (label: homebrew.mxcl.tor) - ==> Successfully started `tor` (label: homebrew.mxcl.tor) - -#. That's it! Your Mac is now setup to natively use Tor. \ No newline at end of file +depending on your device (as explained above). This will start Tor and ensure that it is always running, even after a restart.