sync

.gitignore

@@ -1,2 +1,4 @@
 *.apk
 *.zip
+update_verifier/
+venv/

dnscrypt-proxy.toml

@@ -1,26 +1,27 @@
 # https://github.com/drduh/config/blob/master/dnscrypt-proxy.toml
-# https://github.com/jedisct1/dnscrypt-proxy/blob/master/dnscrypt-proxy/example-dnscrypt-proxy.toml
-#user_name = '_dnscrypt-proxy'
-#server_names = ['quad9']
-#server_names = ['abc']
-listen_addresses = ['127.0.0.1:4200']
+# https://github.com/DNSCrypt/dnscrypt-proxy/blob/master/dnscrypt-proxy/example-dnscrypt-proxy.toml
+#dnscrypt_ephemeral_keys = true
+#tls_cipher_suite = [52393]  # TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
+listen_addresses = ['127.0.0.1:5300']
 max_clients = 250
 ipv4_servers = true
 ipv6_servers = false
+dnscrypt_servers = true
+doh_servers = false
+odoh_servers = false
+require_dnssec = false
 block_ipv6 = true
 block_unqualified = true
 block_undelegated = true
-reject_ttl = 60
+reject_ttl = 30
 force_tcp = false
-timeout = 4000
+timeout = 5000
 keepalive = 30
 cert_refresh_delay = 240
-dnscrypt_ephemeral_keys = true
 tls_disable_session_tickets = true
-tls_cipher_suite = [52393]  # TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
 bootstrap_resolvers = ['9.9.9.11:53', '8.8.8.8:53']
 ignore_system_dns = false
-netprobe_timeout = 30
+netprobe_timeout = 60
 cache = true
 cache_size = 4096
 cache_min_ttl = 600
@@ -31,29 +32,28 @@ forwarding_rules = 'forwarding-rules.txt'
 log_level = 2
 log_file = 'dnscrypt.log'
 log_files_max_size = 10
-log_files_max_age = 7
-log_files_max_backups = 1
+log_files_max_age = 30
+log_files_max_backups = 10
 [query_log]
   file = 'query.log'
 [nx_log]
   file = 'nx.log'
 [blocked_names]
   blocked_names_file = 'blocklist.txt'
   log_file = 'blocked.log'
-[blocked_ips]
-  blocked_ips_file = 'ip-blocklist.txt'
-  log_file = 'ip-blocked.log'
-#[allowed_names]
-#  allowed_names_file = 'allowed.txt'
-#  log_file = 'allowed-names.log'
+#[blocked_ips]
+#  blocked_ips_file = 'ip-blocklist.txt'
+#  log_file = 'ip-blocked.log'
+#
 #[sources]
-#  [sources.'public-resolvers']
-#    urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/public-resolvers.md', 'https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md']
+#  [sources.public-resolvers]
+#    urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md', 'https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md']
 #    cache_file = 'public-resolvers.md'
 #    minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+#    refresh_delay = 72
 #    prefix = ''
-#  [sources.'relays']
-#    urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/relays.md', 'https://download.dnscrypt.info/resolvers-list/v2/relays.md']
+#  [sources.relays]
+#    urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/relays.md', 'https://download.dnscrypt.info/resolvers-list/v3/relays.md']
 #    cache_file = 'relays.md'
 #    minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
 #    refresh_delay = 72
@@ -63,8 +63,20 @@ log_files_max_backups = 1
 #    minisign_key = 'RWQBphd2+f6eiAqBsvDZEBXBGHQBJfeG6G+wJPPKxCZMoEQYpmoysKUN'
 #    cache_file = 'quad9-resolvers.md'
 #    prefix = 'quad9-'
+#
+# https://github.com/DNSCrypt/dnscrypt-resolvers/blob/master/v3/public-resolvers.md
 #[static]
-#  [static.'quad9']
+#  [static.quad9-dnscrypt-ip4-filter-ecs-pri-1]
+#    stamp = ''sdns://AQMAAAAAAAAADTkuOS45LjExOjg0NDMgZ8hHuMh1jNEgJFVDvnVnRt803x2EwAuMRwNo34Idhj4ZMi5kbnNjcnlwdC1jZXJ0LnF1YWQ5Lm5ldA'
+#  [static.quad9-dnscrypt-ip4-filter-ecs-pri-2]
+#    stamp = 'sdns://AQMAAAAAAAAAEzE0OS4xMTIuMTEyLjExOjg0NDMgZ8hHuMh1jNEgJFVDvnVnRt803x2EwAuMRwNo34Idhj4ZMi5kbnNjcnlwdC1jZXJ0LnF1YWQ5Lm5ldA'
+#  [static.quad9-dnscrypt-ip4-filter-pri-1]
+#    stamp = 'sdns://AQMAAAAAAAAADDkuOS45Ljk6ODQ0MyBnyEe4yHWM0SAkVUO-dWdG3zTfHYTAC4xHA2jfgh2GPhkyLmRuc2NyeXB0LWNlcnQucXVhZDkubmV0'
+#  [static.quad9-dnscrypt-ip4-filter-pri-2]
 #    stamp = 'sdns://AQMAAAAAAAAAEjE0OS4xMTIuMTEyLjk6ODQ0MyBnyEe4yHWM0SAkVUO-dWdG3zTfHYTAC4xHA2jfgh2GPhkyLmRuc2NyeXB0LWNlcnQucXVhZDkubmV0'
-#  [static.'abc']
-#    stamp = 'sdns://AAAAA...'
+#  [static.quad9-dnscrypt-ip4-filter-pri-3]
+#    stamp = 'sdns://AQMAAAAAAAAAFDE0OS4xMTIuMTEyLjExMjo4NDQzIGfIR7jIdYzRICRVQ751Z0bfNN8dhMALjEcDaN-CHYY-GTIuZG5zY3J5cHQtY2VydC5xdWFkOS5uZXQ'
+#  [static.quad9-dnscrypt-ip4-nofilter-ecs-pri-1]
+#    stamp = 'sdns://AQYAAAAAAAAADTkuOS45LjEyOjg0NDMgZ8hHuMh1jNEgJFVDvnVnRt803x2EwAuMRwNo34Idhj4ZMi5kbnNjcnlwdC1jZXJ0LnF1YWQ5Lm5ldA'
+#  [static.quad9-dnscrypt-ip4-nofilter-ecs-pri-2]
+#    stamp = 'sdns://AQYAAAAAAAAAEzE0OS4xMTIuMTEyLjEyOjg0NDMgZ8hHuMh1jNEgJFVDvnVnRt803x2EwAuMRwNo34Idhj4ZMi5kbnNjcnlwdC1jZXJ0LnF1YWQ5Lm5ldA'

dnsmasq.conf

@@ -17,28 +17,30 @@ stop-dns-rebind
 log-dhcp
 log-facility=/var/log/dnsmasq
 log-queries
+#addn-hosts=/etc/dns-blocklist
 # Block AAAA queries
 #address=/COM/::
 #server=/COM/192.168.1.1
-#addn-hosts=/etc/dns-blocklist
-# Also see drduh/config/domains for domains to block
-# Un-comment one or multiple 'server' lines:
-# Local network router(s)
+# Local resolver
 #server=192.168.1.1
 #server=10.8.1.1
-# DNSCrypt on localhost port 4200
-#server=127.0.0.1#4200
-# Tor on localhost port 53
-#server=127.26.255.1
-# Cloudflare
-#server=1.0.0.1
-#server=1.1.1.1
+# localhost port 5300
+#server=127.0.0.1#5300
 # Google
 #server=8.8.4.4
 #server=8.8.8.8
 # OpenDNS
 #server=208.67.220.220
 #server=208.67.222.222
+#server=208.67.220.123  # family
+#server=208.67.222.123
+# Cloudflare
+#server=1.0.0.1
+#server=1.1.1.1
+#server=1.0.0.2  # filter
+#server=1.1.1.2
+#server=1.0.0.3  # family
+#server=1.1.1.3
 # L3
 #server=4.2.2.1
 #server=4.2.2.2
@@ -48,19 +50,17 @@ log-queries
 #server=4.2.2.6
 #server=209.244.0.3
 #server=209.244.0.4
-# Verisign
-#server=64.6.64.6
-#server=64.6.65.6
-# Hurricane Electric
-#server=74.82.42.42
-# UncensoredDNS
-#server=91.239.100.100
 # Quad9
-#server=9.9.9.9
-#server=9.9.9.10
+# https://www.quad9.net/service/service-addresses-and-features/
+#server=9.9.9.9   # filter-pri
 #server=149.112.112.9
-#server=149.112.112.10
 #server=149.112.112.112
+#server=9.9.9.11  # filter-ecs-pri
+#server=149.112.112.11
+#server=9.9.9.10  # nofilter-pri
+#server=149.112.112.10
+#server=9.9.9.12  # nofilter-ecs-pri
+#server=149.112.112.12
 # Alternate DNS
 #server=76.76.19.19
 #server=76.223.122.150
@@ -70,9 +70,21 @@ log-queries
 # Clean Browsing
 #server=185.228.168.9
 #server=185.228.169.9
-# Clean Browsing Family Filter
-#server=185.228.168.168
+#server=185.228.168.168  # family
 #server=185.228.169.168
-# Cloudflare Family Filter
-#server=1.1.1.3
-#server=1.0.0.3
+# dns0.eu
+#server=185.253.5.0
+#server=193.110.81.0
+#server=185.253.5.1  # family
+#server=193.110.81.1
+#server=185.253.5.9  # filter
+#server=193.110.81.9
+# Verisign
+#server=64.6.64.6
+#server=64.6.65.6
+# Hurricane Electric
+#server=74.82.42.42
+# UncensoredDNS
+#server=91.239.100.100
+# Quad 101 (TWNIC)
+#server=101.101.101.101

domains/apple

@@ -25,6 +25,7 @@ address=/courier-push-apple.com.akadns.net/
 address=/courier-push-applecom.akadns.net/
 address=/courier-sandbox-push-apple.com.akadns.net/
 address=/courier-sandbox-push-applecom.akadns.net/
+address=/edge-itunes-apple.com.akadns.net/
 address=/ess-apple.com.akadns.net/
 address=/gc-apple.com.akadns.net/
 address=/gcsis-applecom.akadns.net/
@@ -40,6 +41,7 @@ address=/itunesradio.com/
 address=/ls-apple.com.akadns.net/
 address=/me.com.akadns.net/
 address=/me.com/
+address=/metrics.icloud.com/
 address=/mzstatic.com/
 address=/oa-apple.com.akadns.net/
 address=/origin-apple.com.akadns.net/

domains/google

@@ -1,5 +1,6 @@
 # https://github.com/drduh/config/blob/master/domains/google
 #address=/1e100.net/
+#address=/accounts.google.com/
 #address=/android.com/
 #address=/app/
 #address=/appspot.com/
@@ -398,7 +399,9 @@ address=/doubleclick.net/
 address=/doubleclickbygoogle.com/
 address=/elgoog.im/
 address=/feedburner.com/
+address=/firebase.googleapis.com/
 address=/firebaseio.com/
+address=/firebaselogging-pa.googleapis.com/
 address=/firebaseremoteconfig.googleapis.com/
 address=/firehunt.com/
 address=/foofle.com/
@@ -426,8 +429,6 @@ address=/googleanalytics.com/
 address=/googleapps.com.cn/
 address=/googleapps.com/
 address=/googlebot.com/
-address=/googlec.om/
-address=/google.om/
 address=/googlecommerce.com/
 address=/googledrive.com.cn/
 address=/googledrive.com/

domains/microsoft

@@ -21,6 +21,7 @@ address=/adecn.com/
 address=/advisor.net/
 address=/afdogw.com/
 address=/ailogiq.com/
+address=/aka.ms/
 address=/anti-spamtools.org/
 address=/aquantive.com/
 address=/aspnetcdn.com/
@@ -391,6 +392,7 @@ address=/microsoft.uz/
 address=/microsoft.vc/
 address=/microsoft.vn/
 address=/microsoft.ws/
+address=/microsoft/
 address=/microsoftadvertising.com/
 address=/microsoftauto.com.br/
 address=/microsoftazuread-sso.com/
@@ -767,7 +769,6 @@ address=/windowsvista.kz/
 address=/windowsxp.com.br/
 address=/windowsxp.nu/
 address=/windowvista.com.br/
-address=/windwosphone.com/
 address=/wldrive.com.br/
 address=/wmplugins.com/
 address=/www-live.com/

domains/misc

@@ -7,16 +7,11 @@
 #address=/amd.com/
 #address=/associates-amazon.com/
 #address=/axshare.com/
-#address=/clickfunnels.com/
 #address=/clickup.com/
 #address=/documentforce.com/
 #address=/dogechain.info/
 #address=/doordash.com/
-#address=/duckdns.org/
 #address=/duckduckgo.com/
-#address=/filebin.net/
-#address=/filecloudonline.com/
-#address=/filetransfer.io/
 #address=/force.com/
 #address=/geoiplookup.io/
 #address=/godaddysites.com/
@@ -25,11 +20,10 @@
 #address=/indeed.com/
 #address=/kaptcha.com/
 #address=/myportfolio.com/
-#address=/oraclecloud.com/
+#address=/nordvpn.com/
 #address=/overwolf.com/
 #address=/playstation.com/
 #address=/pscdn.co/
-#address=/quora.com/
 #address=/salesforceliveagent.com/
 #address=/scdn.co/
 #address=/sentry-cdn.com/
@@ -40,4 +34,5 @@
 #address=/spotifycdn.net/
 #address=/sumologic.com/
 #address=/tospotify.com/
+#address=/yahoo.com/
 #address=/yandex.com/

domains/mozilla

@@ -1,4 +1,5 @@
 # https://github.com/drduh/config/blob/master/domains/mozilla
+# https://support.mozilla.org/en-US/kb/domains-allow-firefox
 #address=/atp.fox/
 #address=/firefox.com-v2.edgesuite.net/
 #address=/firefox.com/
@@ -21,9 +22,11 @@ address=/detectportal.firefox.com/
 address=/dynamicua.cdn.mozilla.net/
 address=/experiments.mozilla.org/
 address=/fhr.cdn.mozilla.net/
+address=/firefox-settings-attachments.cdn.mozilla.net/
 address=/getpocket-cdn.prod.mozaws.net/
 address=/getpocket.cdn.mozilla.net/
 address=/getpocket.com/
+address=/img-getpocket.cdn.mozilla.net/
 address=/input.mozilla.org/
 address=/install.mozilla.org/
 address=/mozorg.cdn.mozilla.net/
@@ -33,6 +36,7 @@ address=/services.mozilla.com/
 address=/snippets.cdn.mozilla.net/
 address=/stage.mozaws.net/
 address=/sumo.mozilla.net/
+address=/sync.services.mozilla.com/
 address=/tbpl.mozilla.org/
 address=/telemetry-experiment.cdn.mozilla.net/
 address=/telemetry.mozilla.org/