align with updates in preparation for merging with the version for eos0.3.0

site/source/misc-guides/tor-firefox/android.rst

@@ -0,0 +1,46 @@
+.. _firefox-tor-android:
+
+**************************************
+Setting up Firefox with Tor on Android
+**************************************
+
+.. warning::
+  This guide assumes you have completed :ref:`setting up Tor for Android<tor-android>`. Please visit this section before proceeding as it is required for Firefox to properly work with Tor.
+
+Once Tor is setup on your system, you can proceed to setup Firefox:
+
+1. Download `Firefox Beta <https://play.google.com/store/apps/details?id=org.mozilla.firefox_beta>`_ from the Play Store, or `Fennec <https://f-droid.org/en/packages/org.mozilla.fennec_fdroid/>`_ from F-Droid.
+
+2. Next, download a `Proxy Auto Config` file that will use Orbot to resolve `.onion` URLs. We have one hosted `here <https://registry.start9labs.com/sys/proxy.pac>`_.
+
+3. Navigate to ``about:config`` in the Firefox URL bar.
+
+.. figure:: /_static/images/tor/about_config.png
+  :width: 50%
+  :alt: Firefox about config
+
+4. You are going to have to change a few options in here. First, type ``network.proxy.type`` into the search bar, and set the value to ``2``.
+
+.. figure:: /_static/images/tor/network_proxy_type.png
+  :width: 50%
+  :alt: Firefox network proxy type setting screenshot
+
+5. Search for ``network.proxy.autoconfig_url``, and set the value to ``file:///storage/emulated/0/Download/proxy.pac``.
+
+.. figure:: /_static/images/tor/autoconfig_url.png
+  :width: 50%
+  :alt: Firefox autoconfig url setting screenshot
+
+6. Search for ``network.proxy.socks_remote_dns``, and set the value to ``true``.
+
+.. figure:: /_static/images/tor/socks_remote_dns.png
+  :width: 50%
+  :alt: Firefox socks remote dns setting screenshot
+
+7. Search for ``dom.securecontext.whitelist_onions`` and set the value to ``true``.
+
+.. figure:: /_static/images/tor/firefox_whitelist_mobile.png
+  :width: 50%
+  :alt: Firefox whitelist onions screenshot
+
+8. Restart Firefox, and you’re all set! You should now be able to navigate to `.onion` URLs in Firefox. This means you can bookmark Cups Messenger, and use your Bitwarden Tor address in the `Bitwarden Password Manager <https://play.google.com/store/apps/details?id=com.x8bit.bitwarden&hl=en_US&gl=US>`_ native application.

site/source/misc-guides/tor-firefox/desktop.rst

@@ -0,0 +1,94 @@
+.. _firefox-tor-desktop:
+
+**************************************
+Setting up Firefox with Tor on Desktop
+**************************************
+
+.. warning::
+  This guide assumes you have completed :ref:`setting up Tor<running-tor>`. Please visit this section first before you proceed as it is required for Firefox to properly work with Tor.
+
+1. Open Firefox.
+
+2. Enter ``about:config`` in the URL bar. Accept any warnings that may appear about accessing advanced settings.
+
+3. Search for ``dom.securecontext.whitelist_onions`` and set the value to ``true``.
+
+   .. figure:: /_static/images/tor/firefox_whitelist.png
+    :width: 80%
+    :alt: Firefox whitelist onions screenshot
+
+4. Download a `Proxy Auto Config` file to inform Firefox how to use the Tor daemon running on your computer. You can get Start9's standard file by following the OS-specific instructions below:
+    Windows:  
+
+    Click `here <https://registry.start9labs.com/sys/proxy.pac>`_ to get the file and save the file somewhere you won’t delete it.  Please remember the location you save the file in if you do not use our example location.  For this example:
+
+    .. code-block::
+
+      C:\Program Files\Tor Browser\proxy.pac
+
+    Mac:
+
+    Open the ``Terminal`` App on your Mac. You can find it in your list of Applications.  In the terminal, enter:
+
+    .. code-block::
+
+      brew install wget
+
+    And then:
+
+    .. code-block::
+
+      wget -P /usr/local/etc/tor https://registry.start9labs.com/sys/proxy.pac
+
+    Linux:
+
+    From a terminal, enter:
+
+    .. code-block::
+
+      sudo wget -P /etc/tor https://registry.start9labs.com/sys/proxy.pac
+
+
+5. Now open your Firefox web browser, and select options (Windows), or preferences (Mac/Linux):
+
+   .. figure:: /_static/images/tor/firefox_options_windows.png
+    :width: 80%
+    :alt: Firefox options screenshot
+
+    Select :menuselection:``Settings --> Options``
+
+
+6. Search for the term “proxy” in the search bar in the upper right, then select the button that says ``Settings…``:
+
+   .. figure:: /_static/images/tor/firefox_search.png
+    :width: 80%
+    :alt: Firefox search screenshot
+
+7. This should open a menu that will allow you to configure your proxy settings. Select ``Automatic proxy configuration URL`` and paste in the path to your PAC file from earlier, prefixed with ``file://``. For example:
+    Windows:
+
+    .. code-block::
+
+      file://C:/Program Files/Tor Browser/proxy.pac
+
+    Mac:
+
+    .. code-block::
+
+      file:///usr/local/etc/tor/proxy.pac
+
+    Linux:
+
+    .. code-block::
+
+      file:///etc/tor/proxy.pac
+
+8. Then, check the box labeled ``Proxy DNS when using SOCKS v5``:
+
+   .. figure:: /_static/images/tor/firefox_proxy.png
+    :width: 80%
+    :alt: Firefox proxy settings screenshot
+
+9. Click ``OK`` and then restart Firefox for the changes to take effect.
+
+10. You’re all set! You should now be able to navigate to ``.onion`` URLs in Firefox. This means you can bookmark Cups Messenger, and use your Bitwarden Tor address in the `Bitwarden Firefox Plugin <https://addons.mozilla.org/en-US/firefox/addon/bitwarden-password-manager/>`_.

site/source/misc-guides/tor-firefox/index.rst

@@ -0,0 +1,16 @@
+.. _configure_firefox_tor:
+
+***************************
+Configuring Firefox for Tor
+***************************
+
+.. warning::
+  This guide assumes you are already :ref:`running Tor on your phone or computer<running-tor>`.
+
+Once you have completed the above guide, select your device's operating system below:
+
+.. toctree::
+  :maxdepth: 2
+
+  Desktop<desktop>
+  Mobile<mobile>

site/source/misc-guides/tor-firefox/ios.rst

@@ -0,0 +1,9 @@
+.. _firefox-tor-ios:
+
+**********************************
+Setting up Firefox with Tor on iOS
+**********************************
+
+Unfortunately, Apple does not allow tor to be run natively on iOS.  This means that Firefox cannot be configured to use tor.  This leaves the following options for iOS users:
+
+You can use Start9's own Consulate Browser, which is available `here <https://apps.apple.com/us/app/start9-consulate-browser/id1528124570>`_, or you can select another Tor Browser by searching the `App Store <https://www.apple.com/us/search/onion-browser?src=serp>`_.

site/source/misc-guides/tor-firefox/mobile.rst

@@ -0,0 +1,13 @@
+.. _firefox-tor-mobile:
+
+**************************************
+Setting up Firefox with Tor on Mobile
+**************************************
+
+If you are on Android, you can continue after setting up Tor on your device.  If you are on iOS, click below for your options.
+
+.. toctree::
+  :maxdepth: 1
+
+  Android<android>
+  iOS<ios>