From fa512f47d541f5e8214d4e1b8731e119ab9e1e27 Mon Sep 17 00:00:00 2001
From: Jack Chou <jcacct@protonmail.ch>
Date: Wed, 12 Aug 2020 05:18:23 -0700
Subject: [PATCH 1/3] Updated Cloudflare DNS Logging policy tooltip and link

---
 _includes/sections/dns.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_includes/sections/dns.html b/_includes/sections/dns.html
index 2c980c45..a5e9ffb1 100644
--- a/_includes/sections/dns.html
+++ b/_includes/sections/dns.html
@@ -168,7 +168,7 @@ We also log how many times this or that tracker has been blocked. We need this i
           </a>
         </td>
         <td>Commercial</td>
-        <td><a data-toggle="tooltip" data-placement="bottom" data-original-title='"We will collect limited DNS query data that is sent to the resolvers. This data does not contain user IP addresses or any other personally identifiable information, and the bulk of the data is only stored for 24 hours."' href="https://developers.cloudflare.com/1.1.1.1/commitment-to-privacy/privacy-policy/privacy-policy/">Some</a></td>
+        <td><a data-toggle="tooltip" data-placement="bottom" data-original-title="We will collect limited DNS query data that is sent to our 1.1.1.1 resolver. Our 1.1.1.1 resolver service does not log personal data, and the bulk of the limited non-personally identifiable query data is only stored for 25 hours." href="https://developers.cloudflare.com/1.1.1.1/privacy/public-dns-resolver/">Some</a></td>
         <td>DoH, DoT</td>
         <td>Yes</td>
         <td>Yes</td>
-- 
2.47.2


From ac91e8e968c5f0170c1d3ffb72793aba87c926a0 Mon Sep 17 00:00:00 2001
From: Jack Chou <jcacct@protonmail.ch>
Date: Fri, 14 Aug 2020 10:43:24 -0700
Subject: [PATCH 2/3] Correct tooltip content to clarify subject DNS provider

Co-authored-by: Jonah Aragon <jonah@triplebit.net>
---
 _includes/sections/dns.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_includes/sections/dns.html b/_includes/sections/dns.html
index a5e9ffb1..f9e0b821 100644
--- a/_includes/sections/dns.html
+++ b/_includes/sections/dns.html
@@ -168,7 +168,7 @@ We also log how many times this or that tracker has been blocked. We need this i
           </a>
         </td>
         <td>Commercial</td>
-        <td><a data-toggle="tooltip" data-placement="bottom" data-original-title="We will collect limited DNS query data that is sent to our 1.1.1.1 resolver. Our 1.1.1.1 resolver service does not log personal data, and the bulk of the limited non-personally identifiable query data is only stored for 25 hours." href="https://developers.cloudflare.com/1.1.1.1/privacy/public-dns-resolver/">Some</a></td>
+        <td><a data-toggle="tooltip" data-placement="bottom" data-original-title="Cloudflare collects and stores only the limited DNS query data that is sent to the 1.1.1.1 resolver. The 1.1.1.1 resolver service does not log personal data, and the bulk of the limited non-personally identifiable query data is only stored for 25 hours." href="https://developers.cloudflare.com/1.1.1.1/privacy/public-dns-resolver/">Some</a></td>
         <td>DoH, DoT</td>
         <td>Yes</td>
         <td>Yes</td>
-- 
2.47.2


From 83f2bb254c0c728b3fc1fc68ba1cdef0877b064f Mon Sep 17 00:00:00 2001
From: Daniel Gray <dng@disroot.org>
Date: Sat, 15 Aug 2020 06:58:33 +0000
Subject: [PATCH 3/3] Remove irrelevant warnings, see PR for details

---
 _includes/sections/dns.html | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/_includes/sections/dns.html b/_includes/sections/dns.html
index f9e0b821..5c2508c5 100644
--- a/_includes/sections/dns.html
+++ b/_includes/sections/dns.html
@@ -147,12 +147,6 @@ We also log how many times this or that tracker has been blocked. We need this i
       <tr>
         <td data-value="Cloudflare">
           <a href="https://developers.cloudflare.com/1.1.1.1/setting-up-1.1.1.1/">Cloudflare</a>
-          {% include badge.html
-          link="https://codeberg.org/crimeflare/cloudflare-tor/"
-          color="warning"
-          icon="fas fa-exclamation-triangle"
-          tooltip="Cloudflare is one of the world's largest networks, and a problem considering anonymity and decentralization."
-          %}
         </td>
         <td>Anycast (based in
           <span class="no-text-wrap">
@@ -420,11 +414,6 @@ We also log how many times this or that tracker has been blocked. We need this i
       <tr>
         <td data-value="Quad9">
           <a href="https://quad9.net/">Quad9</a>
-          {% include badge.html
-          color="warning"
-          icon="fas fa-exclamation-triangle"
-          tooltip="Founders include the Global Cyber Alliance, composed of the City of London Police and Manhattan District Attorney's Office."
-          %}
         </td>
         <td>Anycast (based in
           <span class="no-text-wrap">
-- 
2.47.2