From 5acfcd758a1900a594f62e55c9edea32d285d3aa Mon Sep 17 00:00:00 2001
From: dimon <dimon@iron.home.local>
Date: Mon, 12 Aug 2024 18:05:52 +0000
Subject: [PATCH] Update 'setup_tor.sh'

---
 setup_tor.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/setup_tor.sh b/setup_tor.sh
index 0c04fdc..d4b58d8 100644
--- a/setup_tor.sh
+++ b/setup_tor.sh
@@ -1,6 +1,15 @@
 #!/bin/sh
 sh /setup_programs.sh
-apt install -y tor obfs4proxy
+apt install -y obfs4proxy apt-transport-https gpg
+
+# see https://deb.torproject.org/torproject.org/pool/main/t/tor/
+# see https://support.torproject.org/apt/tor-deb-repo/
+wget https://git.dfosd.synology.me/docker/ubuntu-tor/raw/branch/master/tor.list -O /etc/apt/sources.list.d/tor.list
+# https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc
+wget -qO- --user ${FTP_USER} --password ${FTP_PASSWORD} ftp://${FTP_HOST}:${FTP_PORT}/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc | gpg --dearmor | tee /usr/share/keyrings/deb.torproject.org-keyring.gpg >/dev/null
+
+apt update
+apt install -y tor deb.torproject.org-keyring
 
 rm /etc/tor/torrc
 wget https://git.dfosd.synology.me/docker/ubuntu-tor/raw/branch/master/torrc -O /etc/tor/torrc
\ No newline at end of file