Try to merge Cisco changes again

This commit is contained in:
Frank Denis 2020-03-13 17:15:56 +01:00
parent 441ce2de7c
commit ffccb392c2
4 changed files with 10 additions and 10 deletions

View File

@ -36,7 +36,7 @@ address when forwarding them to a selection of companies and organizations.
Currently incompatible with DNS anonymization.
sdns://AQAAAAAAAAAADjIwOC42Ny4yMjAuMTIzILc1EUAgbyJdPivYItf9aR6hwzzI1maNDL4Ev6vKQ_t5GzIuZG5zY3J5cHQtY2VydC5vcGVuZG5zLmNvbQ
sdns://AQEAAAAAAAAADjIwOC42Ny4yMjAuMTIzILc1EUAgbyJdPivYItf9aR6hwzzI1maNDL4Ev6vKQ_t5GzIuZG5zY3J5cHQtY2VydC5vcGVuZG5zLmNvbQ
## cisco-familyshield-doh

View File

@ -1,4 +1,4 @@
untrusted comment: signature from minisign secret key
RWQf6LRCGA9i599yRUXwa9CuOJ1hNmPYFZQLjXpt3dMKXfvVTPaETECyV1OIwHq7QgBQ2g5h1e0RjGc+K7WIa1jFuGCt+LvAmgg=
trusted comment: timestamp:1584115927 file:parental-control.md
pxAUy3X0eYiKGLVD5t1CEe4zX8kJcs0uX8UlI3iL89uNH1XxeA5WZKOBKV+V6u+0dHFElVBriAKtQ7Ghf7SKDA==
RWQf6LRCGA9i590Sb/pwmwRm/TyWI4fpBE9m+CcdRGsMb2F2dKeg3bJjb7jh0hQzPXgoklAfZVwTg/rAsl15sHfTKifsG/PQNQc=
trusted comment: timestamp:1584116154 file:parental-control.md
QyvnKNQeu6CKyCm8VD5dQC79EPAKXWGM6XMc3KWzRGOWHjp3byjn2ZT5d5TXKi55p95emnon4/1K6F9jnqZ8DQ==

View File

@ -195,7 +195,7 @@ address when forwarding them to a selection of companies and organizations.
Currently incompatible with DNS anonymization.
sdns://AQEAAAAAAAAADDIwOC42Ny4yMjAuMiC3NRFAIG8iXT4r2CLX_WkeocM8yNZmjQy-BL-rykP7eRsyLmRuc2NyeXB0LWNlcnQub3BlbmRucy5jb20
sdns://AQEAAAAAAAAADjIwOC42Ny4yMjAuMjIwILc1EUAgbyJdPivYItf9aR6hwzzI1maNDL4Ev6vKQ_t5GzIuZG5zY3J5cHQtY2VydC5vcGVuZG5zLmNvbQ
## cisco-doh
@ -217,7 +217,7 @@ address when forwarding them to a selection of companies and organizations.
Currently incompatible with DNS anonymization.
sdns://AQAAAAAAAAAADjIwOC42Ny4yMjAuMTIzILc1EUAgbyJdPivYItf9aR6hwzzI1maNDL4Ev6vKQ_t5GzIuZG5zY3J5cHQtY2VydC5vcGVuZG5zLmNvbQ
sdns://AQEAAAAAAAAADjIwOC42Ny4yMjAuMTIzILc1EUAgbyJdPivYItf9aR6hwzzI1maNDL4Ev6vKQ_t5GzIuZG5zY3J5cHQtY2VydC5vcGVuZG5zLmNvbQ
## cisco-familyshield-doh
@ -227,7 +227,7 @@ Block websites not suitable for children (DoH protocol)
Warning: modifies your queries to include a copy of your network
address when forwarding them to a selection of companies and organizations.
sdns://AgAAAAAAAAAADDE0Ni4xMTIuNDEuMyBUDrXp92r0ml9Aq9cu3mXf2w_ugmc61w74ZllxOxR-Vxxkb2guZmFtaWx5c2hpZWxkLm9wZW5kbnMuY29tCi9kbnMtcXVlcnk
sdns://AQEAAAAAAAAAEVsyNjIwOjExOTozNTo6MzVdILc1EUAgbyJdPivYItf9aR6hwzzI1maNDL4Ev6vKQ_t5GzIuZG5zY3J5cHQtY2VydC5vcGVuZG5zLmNvbQ
## cisco-ipv6

View File

@ -1,4 +1,4 @@
untrusted comment: signature from minisign secret key
RWQf6LRCGA9i59aylFuTYGzPmehBB+W0waZsgRskFPKRQ+kUvGSD+ZD/fxs3qts1wgDXQhCAg9oJpKyA6QJnbnBSydl/oTxFgQ4=
trusted comment: timestamp:1584115918 file:public-resolvers.md
eG43ePJ97E7gFSreEoZerSOHCu3ncXaMQAOR06n2xpuXFJ/FXO3A4XpdOWzgj4GA9TAKozwwB/aNp5JtsD2SBA==
RWQf6LRCGA9i59oSl1T1MqEdiXqlVwaOwbGz/jqnVSDv27heoeTkvfgzaS+aUZUJ2w2XZt3wdak0qA58dEHyaXhSCAfrGVTyAQA=
trusted comment: timestamp:1584116154 file:public-resolvers.md
N7sJzkhtLMcKP5NnWVWfLHr8hNaU8ifo50dIv9tYCq1PhBi7XfBDB0cIINd/p4Wvj+IN4v6LKuA/J0D3qepoAg==