[toml] Sync with upstream (see description)

- Cleanup relays - f0a1b3bcbf
- Removed dct-at1 resolver - c5788d1e42
- Removed gombadi-syd resolver - c8b3aeaea1
- Removed moulticast-ca-ipv4 resolver - 294a3ccb93
This commit is contained in:
quindecim 2022-05-30 23:51:09 +02:00 committed by GitHub
parent 37713c5699
commit 6927f23500
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 7 deletions

View File

@ -29,7 +29,7 @@
## ##
## Remove the leading # first to enable this; lines starting with # are ignored. ## Remove the leading # first to enable this; lines starting with # are ignored.
server_names = ['acsacsar-ams-ipv4', 'altername', 'ams-dnscrypt-nl', 'bcn-dnscrypt', 'd0wn-tz-ns1', 'dct-at1', 'dct-de1', 'dct-ru1', 'dns.watch', 'dnscrypt.be', 'dnscrypt.ca-1', 'dnscrypt.ca-2', 'dnscrypt.eu-nl', 'dnscrypt.pl', 'dnscrypt.uk-ipv4', 'dnswarden-asia-uncensor-dcv4', 'dnswarden-eu-uncensor-dcv4', 'dnswarden-us-uncensor-dcv4', 'gombadi-syd', 'meganerd', 'moulticast-ca-ipv4', 'moulticast-de-ipv4', 'moulticast-fr-ipv4', 'moulticast-sg-ipv4', 'moulticast-uk-ipv4', 'plan9-dns', 'plan9-ns2', 'pryv8boi', 'pwoss.org-dnscrypt', 'resolver4.dns.openinternet.io', 'scaleway-ams', 'scaleway-fr', 'serbica', 'techsaviours.org-dnscrypt', 'v.dnscrypt.uk-ipv4'] server_names = ['acsacsar-ams-ipv4', 'altername', 'ams-dnscrypt-nl', 'bcn-dnscrypt', 'd0wn-tz-ns1', 'dct-de1', 'dct-ru1', 'dns.watch', 'dnscrypt.be', 'dnscrypt.ca-1', 'dnscrypt.ca-2', 'dnscrypt.eu-nl', 'dnscrypt.pl', 'dnscrypt.uk-ipv4', 'dnswarden-asia-uncensor-dcv4', 'dnswarden-eu-uncensor-dcv4', 'dnswarden-us-uncensor-dcv4', 'meganerd', 'moulticast-de-ipv4', 'moulticast-fr-ipv4', 'moulticast-sg-ipv4', 'moulticast-uk-ipv4', 'plan9-dns', 'plan9-ns2', 'pryv8boi', 'pwoss.org-dnscrypt', 'resolver4.dns.openinternet.io', 'scaleway-ams', 'scaleway-fr', 'serbica', 'techsaviours.org-dnscrypt', 'v.dnscrypt.uk-ipv4']
## List of local addresses and ports to listen to. Can be IPv4 and/or IPv6. ## List of local addresses and ports to listen to. Can be IPv4 and/or IPv6.
@ -796,26 +796,23 @@ fragments_blocked = ['cisco', 'cisco-ipv6', 'cisco-familyshield', 'cisco-familys
routes = [ routes = [
{ server_name='acsacsar-ams-ipv4', via=['anon-meganerd', 'anon-scaleway-ams'] }, { server_name='acsacsar-ams-ipv4', via=['anon-meganerd', 'anon-scaleway-ams'] },
{ server_name='altername', via=['anon-curzon-prg', 'anon-sth-se'] }, { server_name='altername', via=['anon-cs-poland', 'anon-sth-se'] },
{ server_name='ams-dnscrypt-nl', via=['anon-meganerd', 'anon-scaleway-ams'] }, { server_name='ams-dnscrypt-nl', via=['anon-meganerd', 'anon-scaleway-ams'] },
{ server_name='bcn-dnscrypt', via=['anon-cs-barcelona', 'anon-scaleway'] }, { server_name='bcn-dnscrypt', via=['anon-cs-barcelona', 'anon-scaleway'] },
{ server_name='d0wn-tz-ns1', via=['anon-arapurayil-in-ipv4', 'anon-cs-rome'] }, { server_name='d0wn-tz-ns1', via=['anon-arapurayil-in-ipv4', 'anon-cs-rome'] },
{ server_name='dct-at1', via=['anon-cs-austria', 'anon-curzon-prg'] },
{ server_name='dct-de1', via=['anon-cs-de', 'anon-techsaviours.org'] }, { server_name='dct-de1', via=['anon-cs-de', 'anon-techsaviours.org'] },
{ server_name='dct-ru1', via=['anon-curzon-prg', 'anon-sth-se'] }, { server_name='dct-ru1', via=['anon-cs-poland', 'anon-sth-se'] },
{ server_name='dns.watch', via=['anon-cs-de', 'anon-techsaviours.org'] }, { server_name='dns.watch', via=['anon-cs-de', 'anon-techsaviours.org'] },
{ server_name='dnscrypt.be', via=['anon-cs-belgium', 'anon-serbica'] }, { server_name='dnscrypt.be', via=['anon-cs-belgium', 'anon-serbica'] },
{ server_name='dnscrypt.ca-1', via=['anon-cs-montreal', 'anon-inconnu'] }, { server_name='dnscrypt.ca-1', via=['anon-cs-montreal', 'anon-inconnu'] },
{ server_name='dnscrypt.ca-2', via=['anon-cs-montreal', 'anon-inconnu'] }, { server_name='dnscrypt.ca-2', via=['anon-cs-montreal', 'anon-inconnu'] },
{ server_name='dnscrypt.eu-nl', via=['anon-meganerd', 'anon-scaleway-ams'] }, { server_name='dnscrypt.eu-nl', via=['anon-meganerd', 'anon-scaleway-ams'] },
{ server_name='dnscrypt.pl', via=['anon-cs-poland', 'anon-curzon-prg'] }, { server_name='dnscrypt.pl', via=['anon-cs-poland', 'anon-techsaviours.org'] },
{ server_name='dnscrypt.uk-ipv4', via=['anon-cs-london', 'anon-scaleway'] }, { server_name='dnscrypt.uk-ipv4', via=['anon-cs-london', 'anon-scaleway'] },
{ server_name='dnswarden-asia-uncensor-dcv4', via=['anon-saldnssg01-conoha-ipv4', 'anon-tiarap'] }, { server_name='dnswarden-asia-uncensor-dcv4', via=['anon-saldnssg01-conoha-ipv4', 'anon-tiarap'] },
{ server_name='dnswarden-eu-uncensor-dcv4', via=['anon-cs-de', 'anon-techsaviours.org'] }, { server_name='dnswarden-eu-uncensor-dcv4', via=['anon-cs-de', 'anon-techsaviours.org'] },
{ server_name='dnswarden-us-uncensor-dcv4', via=['anon-cs-tx', 'anon-plan9-ns2'] }, { server_name='dnswarden-us-uncensor-dcv4', via=['anon-cs-tx', 'anon-plan9-ns2'] },
{ server_name='gombadi-syd', via=['anon-cs-sydney', 'anon-tiarap'] },
{ server_name='meganerd', via=['anon-acsacsar-ams-ipv4', 'anon-scaleway-ams'] }, { server_name='meganerd', via=['anon-acsacsar-ams-ipv4', 'anon-scaleway-ams'] },
{ server_name='moulticast-ca-ipv4', via=['anon-cs-montreal', 'anon-inconnu'] },
{ server_name='moulticast-de-ipv4', via=['anon-cs-de', 'anon-techsaviours.org'] }, { server_name='moulticast-de-ipv4', via=['anon-cs-de', 'anon-techsaviours.org'] },
{ server_name='moulticast-fr-ipv4', via=['anon-cs-fr', 'anon-kama'] }, { server_name='moulticast-fr-ipv4', via=['anon-cs-fr', 'anon-kama'] },
{ server_name='moulticast-sg-ipv4', via=['anon-saldnssg01-conoha-ipv4', 'anon-tiarap'] }, { server_name='moulticast-sg-ipv4', via=['anon-saldnssg01-conoha-ipv4', 'anon-tiarap'] },