Merge branch 'master' into next

* master:
  Welcome, ODoH list

utils/format.py

@@ -201,14 +201,17 @@ If you want to contribute changes to a resolvers list, only edit files from the
 
     # Legacy
 
-    with open(md_legacy_path) as f:
+    if os.path.basename(md_path) == "odoh.md":
-        previous_content = f.read()
+        md_legacy_path = md_path
-    if out_legacy == previous_content:
-        print("No changes to the legacy version")
     else:
-        with open(md_legacy_path + ".tmp", "wt") as f:
+        with open(md_legacy_path) as f:
-            f.write(out_legacy)
+            previous_content = f.read()
-            os.rename(md_legacy_path + ".tmp", md_legacy_path)
+        if out_legacy == previous_content:
+            print("No changes to the legacy version")
+        else:
+            with open(md_legacy_path + ".tmp", "wt") as f:
+                f.write(out_legacy)
+                os.rename(md_legacy_path + ".tmp", md_legacy_path)
 
     # Historic
 

v3/odoh.md

@@ -0,0 +1,22 @@
+# ODoH
+
+Oblivious DoH DNS servers and relays.
+
+To use that list, add this to the `[sources]` section of your `dnscrypt-proxy.toml` configuration file:
+
+[sources.'odoh']
+urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/odoh.md', 'https://download.dnscrypt.info/resolvers-list/v3/odoh.md']
+minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+cache_file = 'odoh.md'
+
+--
+
+
+## odoh-crypto-sx
+
+ODoH target server. Anycast, no logs, no censorship, DNSSEC.
+Backend hosted by Scaleway, globally cached via Cloudflare.
+Maintained by Frank Denis.
+
+sdns://BQcAAAAAAAAADWRvaC5jcnlwdG8uc3gKL2Rucy1xdWVyeQ
+

v3/odoh.md.minisig

@@ -0,0 +1,4 @@
+untrusted comment: signature from minisign secret key
+RWQf6LRCGA9i5yUnjR9zn4rDGku+ogD4xRAT5frg4PzoE3Xm5Ol/HdHcQ/4SrHmJsQoIW6QnJ5OUCMezmJZwbOrXTl1B0H188gk=
+trusted comment: timestamp:1623000234	file:odoh.md
+tJYfPmaLiM6WhiswP+AYHqYPVXrwIs4qnr+FjVluxHVeIm9ZL82g5NmAG3SNRkRhazv4g8SYnSxGw5BuqQp3Ag==