Merge branch 'next' into patch-10

This commit is contained in:
Frank Denis 2020-01-31 15:22:40 +01:00 committed by GitHub
commit 9e0feba42e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions

View File

@ -441,14 +441,12 @@ sdns://AQcAAAAAAAAAEjUxLjE1LjEyNC4yMDg6NDM0MyADjE4mkpovrUv1ECTHll_wW3kmiOLAbXmBf
## ams-doh-nl
Resolver in Amsterdam. DoH protocol. Non-logging, non-filtering, DNSSEC.
sdns://AgcAAAAAAAAAETUxLjE1LjEyNC4yMDg6NDQzABRkbnMuYWxla2JlcmcubmV0OjQ0MwEv
## ams-doh-noads-nl
Resolver in Amsterdam. DoH protocol. Non-logging, ADS-Filtering, DNSSEC.
Resolver in Amsterdam. DoH protocol. Non-logging, ads-Filtering, DNSSEC.
sdns://AgMAAAAAAAAAETUxLjE1LjEyNC4yMDg6NDQzABRkbnMuYWxla2JlcmcubmV0OjQ0MwYvbm9hZHM

View File

@ -1,4 +1,4 @@
untrusted comment: signature from minisign secret key
RWQf6LRCGA9i596LgvgePKoYFGU27a9ZBVzNSjoqRZhR5TV+eCMPOGqwg/hVuWJNMvhOzs0JEI81r8UH6gWvZX5fthM3jfShQQ4=
trusted comment: timestamp:1579801262 file:public-resolvers.md
881KssN/LxayrlF27pBgEqMrIlzePoyqKgHg3y0Do1xxvhsH63wQiaVU0d5DBP8XLAMxKz7tAOcdExxF6lNDCQ==
RWQf6LRCGA9i56yqqywWZplu6dZ/JWL1IXFhlbdMUEDR8tirPMaPB1YI9q6lpsiV7ruxEfS78kLmOthDYorGAWmlGUiqvVyldgw=
trusted comment: timestamp:1579882162 file:public-resolvers.md
qLqJ8lSKVI9Tw55FDzp2uawjdVXcM1+wxLB57YpEM1Qc6alO+CgZLQlc9Dogb82IK5nFRRxQkTXC4c9Ac3P8Aw==