From 53b26927bf72edafc6ac59237a32bb2704e96c1a Mon Sep 17 00:00:00 2001
From: nitrohorse <1514352+nitrohorse@users.noreply.github.com>
Date: Mon, 2 Sep 2019 00:23:59 -0700
Subject: [PATCH 1/3] Add hosting providers

---
 _includes/sections/dns.html | 128 +++++++++++++++++++++++++++++++++---
 1 file changed, 120 insertions(+), 8 deletions(-)

diff --git a/_includes/sections/dns.html b/_includes/sections/dns.html
index 9930c910..02f1b604 100644
--- a/_includes/sections/dns.html
+++ b/_includes/sections/dns.html
@@ -47,6 +47,7 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
         <th data-sortable="true">QNAME Minimization</th>
         <th data-sortable="true">Filtering</th>
         <th data-sortable="true">Source Code</th>
+        <th data-sortable="true">Hosting Provider</th>
       </tr>
     </thead>
     <tbody>
@@ -70,12 +71,24 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
         <td>DoH, DoT, DNSCrypt</td>
         <td>Yes</td>
         <td>Yes</td>
-        <td>Ads, trackers, malicious domains</td>
+        <td>
+          <span class="no-text-wrap">
+            Ads, trackers,
+          </span>
+          <span class="no-text-wrap">
+            malicious domains
+          </span>
+        </td>
         <td>
           <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://github.com/AdguardTeam/AdGuardDNS/" href="https://github.com/AdguardTeam/AdGuardDNS/">
             <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
           </a>
         </td>
+        <td>
+          <span class="no-text-wrap">
+            <a href="https://flops.ru/en/about.html">Serveroid, LLC</a>
+          </span>
+        </td>
       </tr>
 
       <tr>
@@ -114,12 +127,37 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
         </td>
         <td>Yes</td>
         <td>Yes</td>
-        <td>Ads, trackers, malicious domains <span class="badge badge-warning" data-toggle="tooltip" data-original-title="And some wildcard, IDN, and non-ASCII domains."><a href="https://github.com/ookangzheng/blahdns#default-blocked-wildcard-domain"><i class="fas fa-exclamation-triangle"></i></a></span></td>
+        <td>
+          <span class="no-text-wrap">
+            Ads, trackers,
+          </span>
+          <span class="no-text-wrap">
+            malicious domains
+            <span class="badge badge-warning" data-toggle="tooltip" data-original-title="And some wildcard, IDN, and non-ASCII domains."><a href="https://github.com/ookangzheng/blahdns#default-blocked-wildcard-domain"><i class="fas fa-exclamation-triangle"></i></a></span>
+          </span>
+        </td>
         <td>
           <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://github.com/ookangzheng/blahdns/" href="https://github.com/ookangzheng/blahdns/">
             <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
           </a>
         </td>
+        <td>
+          <span class="no-text-wrap">
+            <a href="https://www.choopa.com/">Choopa, LLC</a>,
+          </span>
+          <span class="no-text-wrap">
+            <a href="https://www.datacenterlight.ch/">Data Center Light</a>,
+          </span>
+          <span class="no-text-wrap">
+            <a href="https://www.hetzner.com/">Hetzner Online GmbH</a>,
+          </span>
+          <span class="no-text-wrap">
+            <a href="https://www.ripe.net/">RIPE Network Coordination Centre</a>,
+          </span>
+          <span class="no-text-wrap">
+            <a href="https://www.vultr.com/">Vultr Holdings, LLC</a>
+          </span>
+        </td>
       </tr>
 
       <tr>
@@ -148,6 +186,7 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
             <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
           </a>
         </td>
+        <td>Self</td>
       </tr>
 
       <tr>
@@ -172,6 +211,7 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
         <td>Yes</td>
         <td data-value="No">?</td>
         <td>?</td>
+        <td>Self</td>
       </tr>
 
       <tr>
@@ -202,8 +242,20 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
         </td>
         <td>Yes</td>
         <td>Yes</td>
-        <td>Based on server choice</td>
+        <td>
+          <span class="no-text-wrap">
+            Based on server choice
+          </span>
+        </td>
         <td>?</td>
+        <td>
+          <span class="no-text-wrap">
+            <a href="https://www.apnic.net/">APNIC</a>,
+          </span>
+          <span class="no-text-wrap">
+            <a href="https://www.hetzner.com/">Hetzner Online GmbH</a>
+          </span>
+        </td>
       </tr>
 
       <tr>
@@ -235,6 +287,11 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
         <td>Yes</td>
         <td>No</td>
         <td>?</td>
+        <td>
+          <span class="no-text-wrap">
+            <a href="https://www.ipax.at/">IPAX OG</a>
+          </span>
+        </td>
       </tr>
 
       <tr>
@@ -253,12 +310,19 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
           </a>
         </td>
         <td>Commercial</td>
-        <td><a data-toggle="tooltip" data-placement="bottom" data-original-title='"Some of the features require some sort of data retention. In that case, we give our users the choice to granularly or completely disable those features (and associated data retention), and we follow up immediately on that promise"' href="https://www.nextdns.io/privacy">Based on user choice</a></td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title='"Some of the features require some sort of data retention. In that case, we give our users the choice to granularly or completely disable those features (and associated data retention), and we follow up immediately on that promise"' href="https://www.nextdns.io/privacy">Based on user choice</a>
+        </td>
         <td>DoH, DoT, DNSCrypt</td>
         <td>Yes</td>
         <td>Yes</td>
-        <td>Based on user choice</td>
+        <td>
+          <span class="no-text-wrap">
+            Based on server choice
+          </span>
+        </td>
         <td>?</td>
+        <td>Self</td>
       </tr>
 
       <tr>
@@ -294,12 +358,24 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
         <td>DoT</td>
         <td>Yes</td>
         <td>Yes</td>
-        <td>Based on server choice</td>
+        <td>
+          <span class="no-text-wrap">
+            Based on server choice
+          </span>
+        </td>
         <td>
           <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://git.nixnet.xyz/NixNet/dns" href="https://git.nixnet.xyz/NixNet/dns">
             <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
           </a>
         </td>
+        <td>
+          <span class="no-text-wrap">
+            <a href="https://buyvm.net/">BuyVM Services</a>,
+          </span>
+          <span class="no-text-wrap">
+            <a href="https://frantech.ca/">FranTech Solutions</a>
+          </span>
+        </td>
       </tr>
 
       <tr>
@@ -328,6 +404,14 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
             <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
           </a>
         </td>
+        <td>
+          <span class="no-text-wrap">
+            <a href="https://www.ripe.net/">RIPE Network Coordination Centre</a>,
+          </span>
+          <span class="no-text-wrap">
+            <a href="https://www.transip.nl/">TransIP B.V. Admin</a>
+          </span>
+        </td>
       </tr>
 
       <tr>
@@ -350,8 +434,18 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
         <td>DoH, DoT, DNSCrypt</td>
         <td>Yes</td>
         <td>Yes</td>
-        <td>Malicious domains</td>
+        <td>
+          <span class="no-text-wrap">
+            Malicious domains
+          </span>
+        </td>
         <td>?</td>
+        <td>
+          Self,
+          <span class="no-text-wrap">
+            <a href="https://www.pch.net/">Packet Clearing House</a>
+          </span>
+        </td>
       </tr>
 
       <tr>
@@ -374,8 +468,20 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
         <td>DoH, DoT, DNSCrypt</td>
         <td>Yes</td>
         <td>Yes</td>
-        <td>Based on server choice</td>
+        <td>
+          <span class="no-text-wrap">
+            Based on server choice
+          </span>
+        </td>
         <td>?</td>
+        <td>
+          <span class="no-text-wrap">
+            <a href="https://www.digitalocean.com/">DigitalOcean, Inc.</a>,
+          </span>
+          <span class="no-text-wrap">
+            <a href="https://www.ripe.net/">RIPE Network Coordination Centre</a>
+          </span>
+        </td>
       </tr>
 
       <tr>
@@ -400,6 +506,12 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
         <td>No</td>
         <td>No</td>
         <td>?</td>
+        <td>
+          Self,
+          <span class="no-text-wrap">
+            <a href="https://www.teliacompany.com">Telia Company AB</a>
+          </span>
+        </td>
       </tr>
     </tbody>
   </table>
-- 
2.40.1


From 4a5ee65fdb1489b0b1903edbfd1bd03da2bcd94d Mon Sep 17 00:00:00 2001
From: nitrohorse <1514352+nitrohorse@users.noreply.github.com>
Date: Mon, 2 Sep 2019 09:36:10 -0700
Subject: [PATCH 2/3] Remove RIPE and APNIC

---
 _includes/sections/dns.html | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/_includes/sections/dns.html b/_includes/sections/dns.html
index 02f1b604..f0894aed 100644
--- a/_includes/sections/dns.html
+++ b/_includes/sections/dns.html
@@ -151,9 +151,6 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
           <span class="no-text-wrap">
             <a href="https://www.hetzner.com/">Hetzner Online GmbH</a>,
           </span>
-          <span class="no-text-wrap">
-            <a href="https://www.ripe.net/">RIPE Network Coordination Centre</a>,
-          </span>
           <span class="no-text-wrap">
             <a href="https://www.vultr.com/">Vultr Holdings, LLC</a>
           </span>
@@ -249,9 +246,6 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
         </td>
         <td>?</td>
         <td>
-          <span class="no-text-wrap">
-            <a href="https://www.apnic.net/">APNIC</a>,
-          </span>
           <span class="no-text-wrap">
             <a href="https://www.hetzner.com/">Hetzner Online GmbH</a>
           </span>
@@ -296,7 +290,7 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
 
       <tr>
         <td data-value="nextdns">
-          <a href="https://www.nextdns.io/">nextdns</a>
+          <a href="https://www.nextdns.io/">NextDNS</a>
         </td>
         <td>Anycast (based in
           <span class="no-text-wrap">
@@ -405,9 +399,6 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
           </a>
         </td>
         <td>
-          <span class="no-text-wrap">
-            <a href="https://www.ripe.net/">RIPE Network Coordination Centre</a>,
-          </span>
           <span class="no-text-wrap">
             <a href="https://www.transip.nl/">TransIP B.V. Admin</a>
           </span>
@@ -478,9 +469,6 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
           <span class="no-text-wrap">
             <a href="https://www.digitalocean.com/">DigitalOcean, Inc.</a>,
           </span>
-          <span class="no-text-wrap">
-            <a href="https://www.ripe.net/">RIPE Network Coordination Centre</a>
-          </span>
         </td>
       </tr>
 
-- 
2.40.1


From 706d0c3d45019d4c8d09d2079ad795f2c1203513 Mon Sep 17 00:00:00 2001
From: nitrohorse <1514352+nitrohorse@users.noreply.github.com>
Date: Tue, 3 Sep 2019 18:45:38 -0700
Subject: [PATCH 3/3] Remove BuyVM and Vultr

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

diff --git a/_includes/sections/dns.html b/_includes/sections/dns.html
index 29089228..08d56628 100644
--- a/_includes/sections/dns.html
+++ b/_includes/sections/dns.html
@@ -158,9 +158,6 @@
           <span class="no-text-wrap">
             <a href="https://www.hetzner.com/">Hetzner Online GmbH</a>,
           </span>
-          <span class="no-text-wrap">
-            <a href="https://www.vultr.com/">Vultr Holdings, LLC</a>
-          </span>
         </td>
       </tr>
 
@@ -370,9 +367,6 @@
           </a>
         </td>
         <td>
-          <span class="no-text-wrap">
-            <a href="https://buyvm.net/">BuyVM Services</a>,
-          </span>
           <span class="no-text-wrap">
             <a href="https://frantech.ca/">FranTech Solutions</a>
           </span>
-- 
2.40.1