Merge branch 'next' into cisco

DNSCrypt · Jul 2, 2024 · d2207b3 · d2207b3
2 parents 9057482 + 0150c51
commit d2207b3
Show file tree

Hide file tree

Showing 19 changed files with 791 additions and 735 deletions.
diff --git a/utils/quad9-merge.py b/utils/quad9-merge.py
@@ -48,7 +48,7 @@ def __init__(self, name, description, stamps):
             alt_ip = servers[alt_name].description.split(" ")[-1]
             description += " - " + alt_ip
             stamps += servers[alt_name].stamps
-    print("## " + name)
+    print("## quad9-" + name)
     print(description)
     print("\n".join(stamps))
-    print()
+    print()
diff --git a/v1/dnscrypt-resolvers.csv b/v1/dnscrypt-resolvers.csv
diff --git a/v1/dnscrypt-resolvers.csv.minisig b/v1/dnscrypt-resolvers.csv.minisig
@@ -1,4 +1,4 @@
 untrusted comment: signature from minisign secret key
-RWQf6LRCGA9i54zipirFsCH7I+t+Ygp5mO/IrhmzQ9DaxM+YRAUd5voUR0dF755b0WurKZKvPGCaR0CiwLZzy7Dc0MnUEd5HxQU=
-trusted comment: timestamp:1717848236	file:dnscrypt-resolvers.csv
-iL6ZTt/8QvxHqDlZkhxJfM+lDENoTKH1gv7ncAOGhg85JXHcYW0xRwvK0vBvS18m+yhBVenNZ4LKMpSHoHC4Bg==
+RWQf6LRCGA9i55265t3moT0sF8Hw41ORHKHrAn0bz16Rwlm5+W2oEQRm/GGFFVOSKSOrxLP8JkI5XSnvB8IaFyN8P16s121MNgE=
+trusted comment: timestamp:1719945419	file:dnscrypt-resolvers.csv
+3dqVZitJFQ0OTNBMhfGv+BL8FYi7sSbMqrVWmR9t+Imuso7Fd4zt/+GuL9r+absGX6VlyO6NQlrE2QhICi4hBw==
diff --git a/v2/opennic.md b/v2/opennic.md
@@ -17,14 +17,14 @@ If you want to contribute changes to a resolvers list, only edit files from the
 
 BebasDNS default server by BebasID. DNSSEC and OpenNIC supported. Filters ads, tracker, and malware.
 
-sdns://AQMAAAAAAAAAEjEwMy44Ny42OC4xOTQ6ODQ0MyAxXDKkdrOao8ZeLyu7vTnVrT0C7YlPNNf6trdMkje7QR8yLmRuc2NyeXB0LWNlcnQuZG5zLmJlYmFzaWQuY29t
+sdns://AQIAAAAAAAAAEjEwMy44Ny42OC4xOTQ6ODQ0MyAxXDKkdrOao8ZeLyu7vTnVrT0C7YlPNNf6trdMkje7QR8yLmRuc2NyeXB0LWNlcnQuZG5zLmJlYmFzaWQuY29t
 
 
 ## bebasdns-family
 
 BebasDNS Family Variant by BebasID. DNSSEC and OpenNIC supported. Blocks malicious links, pornography, gambling, and hate websites.
 
-sdns://AQMAAAAAAAAAEjEwMy44Ny42OC4xOTY6ODQ0MyD5k4vgIHmBCZ2DeLtmoDVu1C6nVrRNzSVgZ1T0m0-3rCkyLmRuc2NyeXB0LWNlcnQuaW50ZXJuZXRzZWhhdC5iZWJhc2lkLmNvbQ
+sdns://AQIAAAAAAAAAEjEwMy44Ny42OC4xOTY6ODQ0MyD5k4vgIHmBCZ2DeLtmoDVu1C6nVrRNzSVgZ1T0m0-3rCkyLmRuc2NyeXB0LWNlcnQuaW50ZXJuZXRzZWhhdC5iZWJhc2lkLmNvbQ
 
 
 ## bebasdns-unfiltered-doh

diff --git a/v2/opennic.md.minisig b/v2/opennic.md.minisig
@@ -1,4 +1,4 @@
 untrusted comment: signature from minisign secret key
-RWQf6LRCGA9i553wD+9ziat+xdEO0wzstQK1Hrsyu3sVA1rrwwLbrZPMbxbeilOODTJwBS5jJKHZfLPBlgmA+esm6PNTTLM7xgQ=
-trusted comment: timestamp:1714983479	file:opennic.md
-Fu8bTRypiILN3R5JTUc5Kk+wDZQKrfNh9nE/R1Fwzi3dUAoJDo5G6tKp5cAngRtiRde7pMNHynsXpJshMW7yAg==
+RWQf6LRCGA9i56N9Oa2pyN4i91X4QOLvPF5xCdWm+MuLQWNP9x7Aj4eZaFxWd9HX1rH9xfWSXcFqQh/tZVfGSZTLtaG5a8gCvAc=
+trusted comment: timestamp:1718546549	file:opennic.md
+E2k0l+wCU/i7OWS249Lz/BMLSx9KqJLbMEpgUjhWsFHxew0nLKj5A3K/1clx7k6oEzQW8hILUd5aRdUuWpheCQ==
diff --git a/v2/parental-control.md b/v2/parental-control.md
@@ -42,6 +42,8 @@ sdns://AQMAAAAAAAAAGVsyYTEwOjUwYzA6OmJhZDE6ZmZdOjU0NDMguDFd17FLbuMgpHDcLtaxqjmMy
 
 Block websites not suitable for children (DNSCrypt protocol)
 
+Warning: Doesn't work any more in some countries such as France and Portugal.
+
 Warning: modifies your queries to include a copy of your network
 address when forwarding them to a selection of companies and organizations.
 
@@ -54,6 +56,8 @@ sdns://AQEAAAAAAAAADjIwOC42Ny4yMjAuMTIzILc1EUAgbyJdPivYItf9aR6hwzzI1maNDL4Ev6vKQ
 
 Block websites not suitable for children (IPv6)
 
+Warning: Doesn't work any more in some countries such as France and Portugal.
+
 Warning: This server is incompatible with anonymization.
 
 Warning: modifies your queries to include a copy of your network
@@ -147,7 +151,7 @@ Completely free, no ads or any commercial motive. Operating for 4 years now.
 
 Provided by: https://dnsforfamily.com
 
-sdns://AgMAAAAAAAAADzE2Ny4yMzUuMjM2LjEwN6ARsQLmsfY-UomE1gJfMrE4JB_Ii711GVdNcMmDLVPh6KBa74Q__PLscFX1BKFi8in4ORw3D_OmFj0ts_PWBNYiviBETr1nu4P4gHs5Iek4rJF4uIK9UKrbESMfBEz18I33zhhkbnMtZG9oLmRuc2ZvcmZhbWlseS5jb20KL2Rucy1xdWVyeQ
+sdns://AgMAAAAAAAAADzE2Ny4yMzUuMjM2LjEwN6DMEGDTnIMptitvvH0NbfkwmGm5gefmOS1c2PpAj02A5qD39a8ogB6HfX3zor4o_hSfMnSn7SnxNv1QPOOYy6gLDaCzXgWVDPvYJZ-TdboQGHC4w8TA7FpSl1fmMWfp3iap6KBETr1nu4P4gHs5Iek4rJF4uIK9UKrbESMfBEz18I33zqDmRLppY-M1_nZcuZdrErEOtUKUtCR3dkzLOjrMo6yy_CAqrj-3vwXkyBxBlNykRRHU-a8wR4bsGuchhAnPYqCDVRhkbnMtZG9oLmRuc2ZvcmZhbWlseS5jb20KL2Rucy1xdWVyeQ
 
 
 ## dnsforfamily-doh-no-safe-search
@@ -164,7 +168,7 @@ Warning: This server is incompatible with anonymization.
 
 Provided by: https://dnsforfamily.com
 
-sdns://AgMAAAAAAAAADzE2Ny4yMzUuMjM2LjEwN6ARsQLmsfY-UomE1gJfMrE4JB_Ii711GVdNcMmDLVPh6KBa74Q__PLscFX1BKFi8in4ORw3D_OmFj0ts_PWBNYiviBETr1nu4P4gHs5Iek4rJF4uIK9UKrbESMfBEz18I33zidkbnMtZG9oLW5vLXNhZmUtc2VhcmNoLmRuc2ZvcmZhbWlseS5jb20KL2Rucy1xdWVyeQ
+sdns://AgMAAAAAAAAADzE2Ny4yMzUuMjM2LjEwN6DMEGDTnIMptitvvH0NbfkwmGm5gefmOS1c2PpAj02A5qD39a8ogB6HfX3zor4o_hSfMnSn7SnxNv1QPOOYy6gLDaCzXgWVDPvYJZ-TdboQGHC4w8TA7FpSl1fmMWfp3iap6KBETr1nu4P4gHs5Iek4rJF4uIK9UKrbESMfBEz18I33zqDmRLppY-M1_nZcuZdrErEOtUKUtCR3dkzLOjrMo6yy_CAqrj-3vwXkyBxBlNykRRHU-a8wR4bsGuchhAnPYqCDVSdkbnMtZG9oLW5vLXNhZmUtc2VhcmNoLmRuc2ZvcmZhbWlseS5jb20KL2Rucy1xdWVyeQ
 
 
 ## dnsforfamily-no-safe-search
@@ -204,7 +208,7 @@ sdns://AQMAAAAAAAAAF1syYTAxOjRmODoxYzE3OjRkZjg6OjFdIBMl4s4AFc1JhxIkiipHn-JRjPztj
 Blocks adult content and enforces safe search on major search engines.
 For further customization look here: https://dnswarden.com/customfilter.html
 
-sdns://AgIAAAAAAAAAAKARsQLmsfY-UomE1gJfMrE4JB_Ii711GVdNcMmDLVPh6KBa74Q__PLscFX1BKFi8in4ORw3D_OmFj0ts_PWBNYiviBETr1nu4P4gHs5Iek4rJF4uIK9UKrbESMfBEz18I33zhFkbnMuZG5zd2FyZGVuLmNvbQwvYWR1bHRmaWx0ZXI
+sdns://AgIAAAAAAAAAAKDMEGDTnIMptitvvH0NbfkwmGm5gefmOS1c2PpAj02A5qD39a8ogB6HfX3zor4o_hSfMnSn7SnxNv1QPOOYy6gLDaCzXgWVDPvYJZ-TdboQGHC4w8TA7FpSl1fmMWfp3iap6KBETr1nu4P4gHs5Iek4rJF4uIK9UKrbESMfBEz18I33zqDmRLppY-M1_nZcuZdrErEOtUKUtCR3dkzLOjrMo6yy_CAqrj-3vwXkyBxBlNykRRHU-a8wR4bsGuchhAnPYqCDVRFkbnMuZG5zd2FyZGVuLmNvbQwvYWR1bHRmaWx0ZXI
 
 
 ## doh-cleanbrowsing-adult
@@ -252,7 +256,8 @@ sdns://AQIAAAAAAAAADzEwNC4xNTUuMjM3LjIyNSAnIH_VEgToNntINABd-f_R0wu-KpwzY55u2_iu2
 
 Uses deep learning to block adult websites. Free, DNSSEC, no logs.
 Hosted in Paris, running on a 1-XS server donated by Scaleway.com
+
 Maintained by Frank Denis - https://fr.dnscrypt.info/sfw.html
 
-sdns://AQMAAAAAAAAADzE2My4xNzIuMTgwLjEyNSDfYnO_x1IZKotaObwMhaw_-WRF1zZE9mJygl01WPGh_x8yLmRuc2NyeXB0LWNlcnQuc2Z3LnNjYWxld2F5LWZy
+sdns://AQcAAAAAAAAADzE2My4xNzIuMTgwLjEyNSDfYnO_x1IZKotaObwMhaw_-WRF1zZE9mJygl01WPGh_x8yLmRuc2NyeXB0LWNlcnQuc2Z3LnNjYWxld2F5LWZy
 
diff --git a/v2/parental-control.md.minisig b/v2/parental-control.md.minisig
@@ -1,4 +1,4 @@
 untrusted comment: signature from minisign secret key
-RWQf6LRCGA9i5z2QS6q8ClQesvhV/LluejuVBgnvEnN0061JDkS1BYojveQHBM3KFpH7YulGXjf7i/BJ+GQvI314DFtEvVw10Qw=
-trusted comment: timestamp:1716119220	file:parental-control.md
-qOAoB2i45awtw07YovF4Ii/cBInOaEbKAE82XUNHpMXOxyZiGYw6uu5M5Ah8yIAALcGlb94BAIij2nIsoOr+Cw==
+RWQf6LRCGA9i537dC/5ERmpoP2n8jt50ARPXXRLsWnU26hWGQFDXQfoD5PArjsi2XxM2SXpPEJWd3myOv2LuQIfeJZ5Ekk5cPwg=
+trusted comment: timestamp:1719943086	file:parental-control.md
+H4oJud9K6BN/lWa7AFrgJP83n89d63zi1BhvATO0SPJOTTDuMAoLdQv4M8pAUw2dd+MEWpANWViDlbIHocZmCA==