rework tor and ff recommendations

2026-04-02 05:23:18 +00:00 · 2023-12-09 09:38:50 -07:00
parent 0323279a56
commit 1f7ca9d915
16 changed files with 131 additions and 136 deletions
--- a/site/source/device-guides/android/ca-android.rst
+++ b/site/source/device-guides/android/ca-android.rst
@@ -5,8 +5,6 @@ Trusting Your Root CA on Android
 ================================
 Complete this guide to trust your server's Root Certificate Authority (Root CA) on Android.

-.. warning:: You must use `Firefox Beta <https://blog.mozilla.org/security/2019/02/14/why-does-mozilla-maintain-our-own-root-certificate-store/>`_ on Android. The regular Firefox app will not work.
-
 .. warning:: This guide only applies to Android phones running Android v13+, as well as phones running CalyxOS, GrapheneOS, or LineageOS (v19+).

 #. Ensure you have :ref:`downloaded your Root CA <root-ca-download>`
@@ -17,4 +15,4 @@ Complete this guide to trust your server's Root Certificate Authority (Root CA)
        :width: 15%
        :alt: Install certificate

-#. If using Firefox (recommended), complete :ref:`this final step <ca-ff>`
+#. If you choose to use Firefox, you must use `Firefox Beta <https://blog.mozilla.org/security/2019/02/14/why-does-mozilla-maintain-our-own-root-certificate-store/>`_. Then complete :ref:`this final step <ca-ff>`.
--- a/site/source/device-guides/android/tor-android.rst
+++ b/site/source/device-guides/android/tor-android.rst
@@ -5,12 +5,8 @@ Running Tor on Android
 ======================
 Some apps, such as the official Tor Browser, have Tor built in. They do not require additional software or configurations to utilize Tor. Most apps, however, do not have Tor built in. They require an app called Orbot to be installed in order to utilize the Tor Network.

-.. warning:: You must use `Firefox Beta <https://blog.mozilla.org/security/2019/02/14/why-does-mozilla-maintain-our-own-root-certificate-store/>`_ on Android. The regular Firefox app will not work.
-
 Running Orbot
 -------------
-Orbot is a system-wide proxy for your Android device that enables communications over Tor.
-
 #. Download and install Orbot from the `Play Store <https://play.google.com/store/apps/details?id=org.torproject.android>`_, or from `F-Droid <https://f-droid.org/packages/org.torproject.android>`_ (must open with F-Droid app).  Then launch the app.

    .. note:: When using F-Droid, you will need to activate the Guardian Project repository by visiting the ``Settings`` menu (bottom right) -> ``Repositories`` -> ``Guardian Project Official Releases``
@@ -75,10 +71,12 @@ You can also add the following browsers to the Tor-Enabled Apps list to easily a

 - Chrome
 - Vanadium
+- Firefox (see below)

-  .. caution:: Pushing apps through Orbot's VPN mode will allow you to access .onion URLs, however, all other traffic will also go through Tor.  This means connections to some sites may be blocked by site operators' fraud prevention measures, especially e-commerce sites where credit cards are used.  Proceed with caution especially for Web Browsers.
+  .. caution:: Pushing apps through Orbot's VPN mode will allow you to access .onion URLs, however, all other traffic will also go through Tor. This means connections to some sites may be blocked by site operators' fraud prevention measures, especially e-commerce sites where credit cards are used. Proceed with caution especially for Web Browsers. Use Firefox (below) to avoid these issues.

+If Using Firefox
+----------------
+.. warning:: You must use `Firefox Beta <https://blog.mozilla.org/security/2019/02/14/why-does-mozilla-maintain-our-own-root-certificate-store/>`_ on Android.

-If using Firefox (recommended)
------------------------------
-Complete this guide: :ref:`tor-ff`
+You can configure the Firefox Beta browser to use Orbot `without` adding it as a VPN app by following :ref:`this guide <tor-ff>`. This way, Firefox will use Tor only when necessary and avoid some of the issue created by using Tor unconditionally.
--- a/site/source/device-guides/ios/tor-ios.rst
+++ b/site/source/device-guides/ios/tor-ios.rst
@@ -4,7 +4,7 @@
 Running Tor on iOS
 ==================

-Orbot is a system-wide proxy for your iOS device that enables communications over Tor.
+.. warning:: Orbot is currently broken for iOS. We are hopeful that a future release of Orbot or iOS will resolve the issue.

 #. Download and install `Orbot from the Apple appstore <https://apps.apple.com/us/app/orbot/id1609461599>`_.
 #. Open Orbot and tap on "Settings".
@@ -19,5 +19,3 @@ Orbot is a system-wide proxy for your iOS device that enables communications ove
    .. figure:: /_static/images/tor/ios-orbot-connecting-full.png
      :width: 35%
      :alt: iOS Orbot Connecting to Tor
-
-#. Apps will now work transparently when requesting onion urls!
--- a/site/source/device-guides/linux/ca-linux.rst
+++ b/site/source/device-guides/linux/ca-linux.rst
@@ -35,7 +35,7 @@ Trusting Your Root CA on Linux

            In the output it should say ``1 added`` if it was successful.  For most applications, you will now be able to securely connect via ``https``.

-        #. If using Firefox (recommended), complete :ref:`this final step <ca-ff>`
+        #. If using Firefox, complete :ref:`this final step <ca-ff>`

    .. group-tab:: Arch/Garuda

--- a/site/source/device-guides/linux/tor-linux.rst
+++ b/site/source/device-guides/linux/tor-linux.rst
@@ -94,4 +94,4 @@ Using Tor on Linux

                sudo systemctl enable --now tor

-If using Firefox (recommended), you will also need to complete this guide: :ref:`tor-ff`
+If using Firefox, you will also need to complete this guide: :ref:`tor-ff`
--- a/site/source/device-guides/mac/ca-mac.rst
+++ b/site/source/device-guides/mac/ca-mac.rst
@@ -51,4 +51,4 @@ Complete this guide to trust your server's Root Certificate Authority (Root CA)

    .. tip:: If the keychain console did not show the certificate as trusted, press "Command + spacebar" and type “Keychain Access”, and hit enter to re-open it.

-#. If using Firefox (recommended), complete :ref:`this final step <ca-ff>`
+#. If using Firefox, complete :ref:`this final step <ca-ff>`
--- a/site/source/device-guides/mac/tor-mac.rst
+++ b/site/source/device-guides/mac/tor-mac.rst
@@ -170,6 +170,6 @@ Enable Tor System-wide
                
                cat /usr/local/var/log/tor.log || sudo cat /opt/homebrew/var/log/tor.log

-If using Firefox (recommended)
------------------------------
-Complete this guide: :ref:`tor-ff`
+If using Firefox
+----------------
+Firefox can be configured to use Tor on your Mac to resolve .onion URLs. Complete this guide: :ref:`tor-ff`
--- a/site/source/device-guides/windows/ca-windows.rst
+++ b/site/source/device-guides/windows/ca-windows.rst
@@ -83,4 +83,4 @@ Complete this guide to trust your server's Root Certificate Authority (Root CA)
    :width: 20%
    :alt: Console settings

-#. If using Firefox (recommended), complete :ref:`this final step <ca-ff>`
+#. If using Firefox, complete :ref:`this final step <ca-ff>`
--- a/site/source/device-guides/windows/tor-windows.rst
+++ b/site/source/device-guides/windows/tor-windows.rst
@@ -4,6 +4,9 @@
 Running Tor on Windows
 ======================

+Install Tor
+-----------
+
 #. Unfortunately, `The Tor Project <https://torproject.org>`_ no longer publishes a standalone Tor binary for Windows, so the recommended way to get it is with the Tor Browser Bundle. You can download it `here <https://www.torproject.org/download/>`_.

   .. figure:: /_static/images/tor/tor_download_windows.png
@@ -54,4 +57,6 @@ Running Tor on Windows
      2. Uninstall the Tor Browser, following `these steps <https://tb-manual.torproject.org/uninstalling/>`_.
      3. Begin this guide again from the beginning.

-#. If using Firefox (recommended), complete :ref:`this final step <tor-ff>`
+If using Firefox
+----------------
+Firefox can be configured to use Tor running on your Windows machine to resolve .onion URLs. Complete this guide: :ref:`tor-ff`