From 73a902119b1eb2289e97c52257551c0981f45886 Mon Sep 17 00:00:00 2001
From: miracle091 <willywallera@protonmail.com>
Date: Thu, 27 Jan 2022 11:05:00 +0100
Subject: [PATCH] =?UTF-8?q?Aggiunto=20anche=20il=20secondo=20server=20dns?=
 =?UTF-8?q?=20di=20dns.bb=20a=20pihole+dnscrypt=20Rimossa=20la=20possibili?=
 =?UTF-8?q?t=C3=A0=20di=20fare=20da=20relay=20di=20uscita=20per=20tor-sock?=
 =?UTF-8?q?s-proxy=20(era=20gi=C3=A0=20un'impostazione=20base,=20ma=20ades?=
 =?UTF-8?q?so=20=C3=A8=20anche=20dichiarata=20nel=20file=20di=20configuraz?=
 =?UTF-8?q?ione)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pihole+dnscrypt/README.md          |  2 ++
 pihole+dnscrypt/docker-compose.yml |  2 ++
 tor-socks-proxy/README.md          |  4 +++-
 tor-socks-proxy/torrc              | 10 ++++++++--
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/pihole+dnscrypt/README.md b/pihole+dnscrypt/README.md
index a5379f1..ff72d2a 100644
--- a/pihole+dnscrypt/README.md
+++ b/pihole+dnscrypt/README.md
@@ -78,6 +78,7 @@ services:
       - ${DNSCRYPT_CONFIG:-/home/docker/pihole+dnscrypt/dnscrypt}:/config
     dns:
       - 185.222.222.222 # https://dns.sb/privacy/
+      - 45.11.11.11
     restart: unless-stopped
 
   pihole:
@@ -99,6 +100,7 @@ services:
       - ${PIHOLE_DNSMASQD:-/home/docker/pihole+dnscrypt/dnsmasq.d}:/etc/dnsmasq.d/
     dns:
       - 185.222.222.222 # https://dns.sb/privacy
+      - 45.11.11.11
     cap_add:
       - NET_ADMIN
     restart: unless-stopped
diff --git a/pihole+dnscrypt/docker-compose.yml b/pihole+dnscrypt/docker-compose.yml
index 7f438d7..0b84879 100644
--- a/pihole+dnscrypt/docker-compose.yml
+++ b/pihole+dnscrypt/docker-compose.yml
@@ -16,6 +16,7 @@ services:
       - ${DNSCRYPT_CONFIG:-/home/docker/pihole+dnscrypt/dnscrypt}:/config
     dns:
       - 185.222.222.222 # https://dns.sb/privacy/
+      - 45.11.11.11
     restart: unless-stopped
 
   pihole:
@@ -37,6 +38,7 @@ services:
       - ${PIHOLE_DNSMASQD:-/home/docker/pihole+dnscrypt/dnsmasq.d}:/etc/dnsmasq.d/
     dns:
       - 185.222.222.222 # https://dns.sb/privacy
+      - 45.11.11.11
     cap_add:
       - NET_ADMIN
     restart: unless-stopped
diff --git a/tor-socks-proxy/README.md b/tor-socks-proxy/README.md
index 27ec408..07b23fb 100644
--- a/tor-socks-proxy/README.md
+++ b/tor-socks-proxy/README.md
@@ -93,8 +93,10 @@ GuardLifetime 1 days
 ConnectionPadding 1
 ClientOnly 1
 GeoIPExcludeUnknown 1
+ExitPolicy reject *:*
+BridgeRelay 0
 # five eyes e derivati
-# fonte: https://privacyguides.org/providers/#ukusa | https://wikiless.org/wiki/Five_Eyes
+# fonte: https://web.archive.org/web/20211221142643/https://privacyguides.org/providers/#ukusa | https://wikiless.org/wiki/Five_Eyes
 ExcludeNodes {IT}, {GB}, {CA}, {US}, {AU}, {NZ}, {NL}, {FR}, {DK}, {NO}, {SE}, {CN}, {IN}, {RU}, {IE}, {AG}
 
 # opzioni di default
diff --git a/tor-socks-proxy/torrc b/tor-socks-proxy/torrc
index bcff239..43e1347 100644
--- a/tor-socks-proxy/torrc
+++ b/tor-socks-proxy/torrc
@@ -1,13 +1,19 @@
-# custom options
+# opzioni personalizzate
+# fonte: https://2019.www.torproject.org/docs/tor-manual.html.en
 CookieAuthentication 1
 AvoidDiskWrites 1
 GuardLifetime 1 days
 ConnectionPadding 1
 ClientOnly 1
 GeoIPExcludeUnknown 1
+ExitPolicy reject *:*
+BridgeRelay 0
+# five eyes e derivati
+# fonte: https://web.archive.org/web/20211221142643/https://privacyguides.org/providers/#ukusa | https://wikiless.org/wiki/Five_Eyes
 ExcludeNodes {IT}, {GB}, {CA}, {US}, {AU}, {NZ}, {NL}, {FR}, {DK}, {NO}, {SE}, {CN}, {IN}, {RU}, {IE}, {AG}
 
-# default options
+# opzioni di default
+# fonte: https://raw.githubusercontent.com/PeterDaveHello/tor-socks-proxy/master/torrc
 HardwareAccel 1
 Log notice stdout
 DNSPort 0.0.0.0:8853