From 1d9cedc7fa331ec7171dadc9557564f6916d1f78 Mon Sep 17 00:00:00 2001
From: nitrohorse <1514352+nitrohorse@users.noreply.github.com>
Date: Wed, 28 Aug 2019 04:37:28 -0700
Subject: [PATCH 1/2] Add NixNet DNS (#1226)

* Add NixNet DNS

* No text wrap update

* Add source + state filtering
---
 _includes/sections/dns.html | 41 +++++++++++++++++++++++++++++++++++++
 source_code.md              |  2 ++
 2 files changed, 43 insertions(+)

diff --git a/_includes/sections/dns.html b/_includes/sections/dns.html
index ce9b0747..fd1c308e 100644
--- a/_includes/sections/dns.html
+++ b/_includes/sections/dns.html
@@ -261,6 +261,47 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
         <td>?</td>
       </tr>
 
+      <tr>
+        <td data-value="NixNet">
+          <a href="https://nixnet.xyz/dns/">NixNet</a>
+        </td>
+        <td>
+          <span class="no-text-wrap">
+            Anycast (based in
+            <span class="flag-icon flag-icon-us"></span>
+            US),
+          </span>
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-us"></span>
+            US,
+          </span>
+          <span class="no-text-wrap">
+            <span class="flag-icon flag-icon-lu"></span>
+            Luxembourg
+          </span>
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://nixnet.xyz/privacy/" href="https://nixnet.xyz/privacy/">
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          </a>
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title='Part of LibreHosters, "a network of cooperation and solidarity that uses free software to encourage decentralisation through federation and distributed platforms."' href="https://libreho.st/">
+            Informal collective
+          </a>
+        </td>
+        <td>No</td>
+        <td>DoT</td>
+        <td>Yes</td>
+        <td>Yes</td>
+        <td>Based on server choice</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>
+      </tr>
+
       <tr>
         <td data-value="PowerDNS">
           <a href="https://powerdns.org/">PowerDNS</a>
diff --git a/source_code.md b/source_code.md
index 749ef7fb..cfda0ba3 100644
--- a/source_code.md
+++ b/source_code.md
@@ -299,6 +299,8 @@ BlahDNS: https://github.com/ookangzheng/blahdns/
 
 CloudFlare DNS: https://github.com/cloudflare/dns
 
+NixNet DNS: https://git.nixnet.xyz/NixNet/dns
+
 PowerDNS: https://github.com/PowerDNS/pdns
 
 ### Worth Mentioning and Additional Information
-- 
2.49.0


From 33badc8b48a77a857bc2f53bb8e7a6f1f61e0e80 Mon Sep 17 00:00:00 2001
From: Dawid Potocki <dpot@disroot.org>
Date: Wed, 28 Aug 2019 23:35:22 +1200
Subject: [PATCH 2/2] Indicate that there is information on DoT hover

Fixes #1199
---
 _includes/sections/dns.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/_includes/sections/dns.html b/_includes/sections/dns.html
index ce9b0747..637446f1 100644
--- a/_includes/sections/dns.html
+++ b/_includes/sections/dns.html
@@ -107,7 +107,7 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
           <span class="no-text-wrap">
             DoH,
             <span data-toggle="tooltip" data-placement="bottom" data-original-title="Supports port 443 in addition to 853">
-              <strong>DoT</strong>,
+              DoT <span class="fas fa-info-circle fa-sm text-secondary"></span>,
             </span>
           </span>
           DNSCrypt
@@ -195,7 +195,7 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
           <span class="no-text-wrap">
             DoH,
             <span data-toggle="tooltip" data-placement="bottom" data-original-title="Supports port 443 in addition to 853">
-              <strong>DoT</strong>,
+              DoT <span class="fas fa-info-circle fa-sm text-secondary"></span>,
             </span>
           </span>
           DNSCrypt
@@ -227,7 +227,7 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
           <span class="no-text-wrap">
             DoH,
             <span data-toggle="tooltip" data-placement="bottom" data-original-title="Supports port 443 in addition to 853">
-              <strong>DoT</strong>
+              DoT <span class="fas fa-info-circle fa-sm text-secondary"></span>
             </span>
           </span>
         </td>
-- 
2.49.0