From ffccb392c234093a1fa7660d7e39742b575f704a Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Fri, 13 Mar 2020 17:15:56 +0100 Subject: [PATCH] Try to merge Cisco changes again --- v2/parental-control.md | 2 +- v2/parental-control.md.minisig | 6 +++--- v2/public-resolvers.md | 6 +++--- v2/public-resolvers.md.minisig | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/v2/parental-control.md b/v2/parental-control.md index ae0f1f59..5ec5c861 100644 --- a/v2/parental-control.md +++ b/v2/parental-control.md @@ -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 diff --git a/v2/parental-control.md.minisig b/v2/parental-control.md.minisig index 67a81f6d..96588c69 100644 --- a/v2/parental-control.md.minisig +++ b/v2/parental-control.md.minisig @@ -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== diff --git a/v2/public-resolvers.md b/v2/public-resolvers.md index 88ecb145..3ee5e0a8 100644 --- a/v2/public-resolvers.md +++ b/v2/public-resolvers.md @@ -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 diff --git a/v2/public-resolvers.md.minisig b/v2/public-resolvers.md.minisig index 8630e864..c63283d6 100644 --- a/v2/public-resolvers.md.minisig +++ b/v2/public-resolvers.md.minisig @@ -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==