From 6173b1f435f9a3dbff97a82b3a903acf9b2e3c20 Mon Sep 17 00:00:00 2001 From: climbTheStairs Date: Sun, 5 Dec 2021 02:00:31 -0800 Subject: Edit tor.html to follow official instructions Remove OS-specific code, check CPU architecture, make tabs/spaces consistent --- tor.html | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/tor.html b/tor.html index 4135080..ddaa9d2 100644 --- a/tor.html +++ b/tor.html @@ -22,19 +22,21 @@

Installing Tor

-

Firstly we need to add the Tor repos to our system to get the latest version of Tor:

+

First, we need to ensure that our CPU architecture is supported. Ensure that it is either amd64, arm64, or i386:

+
dpkg --print-architecture
+ +

We need to add the Tor repos to our system to get the latest version of Tor:

apt install -y apt-transport-https gpg
-echo "deb https://deb.torproject.org/torproject.org buster main
-deb-src https://deb.torproject.org/torproject.org buster main" > /etc/apt/sources.list.d/tor.list
+echo "deb [signed-by=/usr/share/keyrings/tor-archive-keyring.gpg] https://deb.torproject.org/torproject.org $(lsb_release -cs) main +deb-src [signed-by=/usr/share/keyrings/tor-archive-keyring.gpg] https://deb.torproject.org/torproject.org $(lsb_release -cs) main" > /etc/apt/sources.list.d/tor.list -

Then we need to add the gpg keys to our keyring:

+

Then we need to add the GPG keys to our keyring:

-
curl -s https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc | gpg --import
-gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add -
+
curl -s https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc | gpg --dearmor > /usr/share/keyrings/tor-archive-keyring.gpg
-

Now update and install Tor:

+

Now install Tor:

-
apt update
+        
apt update
 apt install tor deb.torproject.org-keyring

Enabling Tor

@@ -104,6 +106,6 @@ apt install tor

Contributor - tomfasano.co

- + -- cgit v1.2.3