diff --git a/_includes/sections/dns.html b/_includes/sections/dns.html
index f0894aed..29089228 100644
--- a/_includes/sections/dns.html
+++ b/_includes/sections/dns.html
@@ -1,30 +1,37 @@
Domain Name System (DNS)
-{% include cardv2.html
-title="OpenNIC - Service"
-image="/assets/img/tools/OpenNIC.png"
-description="OpenNIC is an alternate network information center/alternative DNS root which lists itself as an alternative to ICANN and its registries. Like all alternative root DNS systems, OpenNIC-hosted domains are unreachable to the vast majority of the Internet."
-website="https://www.opennic.org/"
-forum="https://forum.privacytools.io/t/discussion-opennic/338"
-github="https://github.com/OpenNIC"
+{%
+ include cardv2.html
+ title="OpenNIC - Service"
+ image="/assets/img/tools/OpenNIC.png"
+ description="OpenNIC is an alternate network information center/alternative DNS root which lists itself as an alternative to ICANN and its registries. Like all alternative root DNS systems, OpenNIC-hosted domains are unreachable to the vast majority of the Internet."
+ website="https://www.opennic.org/"
+ forum="https://forum.privacytools.io/t/discussion-opennic/338"
+ github="https://github.com/OpenNIC"
%}
-{% include cardv2.html
-title="Njalla - Domain Registration"
-image="/assets/img/provider/Njalla.png"
-description="Njalla only needs your email or jabber address in order to register a domain name for you. Created by people from The Pirate Bay and IPredator VPN. Accepted Payments: Bitcoin, Litecoin, Monero, DASH, Bitcoin Cash and PayPal. A privacy-aware domain registration service."
-website="https://njal.la/"
-tor="http://njalladnspotetti.onion"
-forum="https://forum.privacytools.io/t/discussion-njalla/339"
+{%
+ include cardv2.html
+ title="Njalla - Domain Registration"
+ image="/assets/img/provider/Njalla.png"
+ description="Njalla only needs your email or XMPP address in order to register a domain name for you. Created by people from The Pirate Bay and IPredator VPN. Accepted Payments: Bitcoin, Litecoin, Monero, DASH, Bitcoin Cash and PayPal. A privacy-aware domain registration service."
+ website="https://njal.la/"
+ tor="http://njalladnspotetti.onion"
+ forum="https://forum.privacytools.io/t/discussion-njalla/339"
%}
-{% include cardv2.html
-title="DNSCrypt - Tool"
-image="/assets/img/tools/DNSCrypt.png"
-description="A protocol for securing communications between a client and a DNS resolver. The DNSCrypt protocol uses high-speed high-security elliptic-curve cryptography and is very similar to DNSCurve, but focuses on securing communications between a client and its first-level resolver."
-website="https://dnscrypt.info/"
-forum="https://forum.privacytools.io/t/discussion-dnscrypt/340"
-github="https://github.com/jedisct1/dnscrypt-proxy"
+{%
+ include cardv2.html
+ title="DNSCrypt-Proxy - Tool"
+ image="/assets/img/tools/DNSCrypt-Proxy.png"
+ description="DNSCrypt-Proxy is a command-line DNS proxy with support for the encrypted DNS protocols, DNS over HTTPS and DNSCrypt. Can cache results to improve speed, and allows filtering, forwarding, and cloaking."
+ website="https://github.com/jedisct1/dnscrypt-proxy/"
+ forum="https://forum.privacytools.io/t/discussion-dnscrypt-proxy/1498"
+ github="https://github.com/jedisct1/dnscrypt-proxy/"
+ linux=""
+ mac=""
+ android=""
+ ios=""
%}
Encrypted ICANN DNS Providers
@@ -479,7 +486,17 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
Anycast (based in
- Denmark)
+ Denmark),
+
+
+
+
+ Denmark,
+
+
+
+
+ US
|
@@ -559,6 +576,10 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
- Namecoin - A decentralized DNS open-source information registration and transfer system based on the Bitcoin cryptocurrency.
- Stubby - An open-source application for Linux, macOS, and Windows that acts as a local DNS Privacy stub resolver using DoT.
+ - Unbound - a validating, recursive, caching DNS resolver. It can also be ran network-wide and has supported DNS-over-TLS since version 1.7.3.
+
Network wide DNS servers:
diff --git a/_includes/sections/email-providers.html b/_includes/sections/email-providers.html
index afff5560..c12a00a3 100644
--- a/_includes/sections/email-providers.html
+++ b/_includes/sections/email-providers.html
@@ -30,7 +30,11 @@
|
2015 |
- Netherlands |
+
+
+ Netherlands
+
+ |
1 GB |
Free |
Accepted |
@@ -46,7 +50,11 @@
2010 |
- Switzerland |
+
+
+ Switzerland
+
+ |
2 GB |
$ 60 |
Accepted |
@@ -63,7 +71,11 @@
2014 |
- Germany |
+
+
+ Germany
+
+ |
2 GB |
12 € |
Accepted |
@@ -79,7 +91,11 @@
2013 |
- Belgium |
+
+
+ Belgium
+
+ |
500 MB |
Free |
Accepted |
@@ -95,7 +111,11 @@
2003 |
- Switzerland |
+
+
+ Switzerland
+
+ |
1 GB |
$ 49.95 |
Accepted |
@@ -111,7 +131,11 @@
2009 |
- Germany |
+
+
+ Germany
+
+ |
2 GB |
12 € |
No |
@@ -128,7 +152,11 @@
2013 |
- Switzerland |
+
+
+ Switzerland
+
+ |
500 MB |
Free |
Accepted |
@@ -145,7 +173,11 @@
1999 |
- Norway |
+
+
+ Norway
+
+ |
1 GB |
$ 19.95 |
Accepted |
@@ -161,7 +193,11 @@
2015 |
- Netherlands |
+
+
+ Netherlands
+
+ |
25 GB |
29 € |
No |
@@ -177,7 +213,11 @@
2014 |
- Netherlands |
+
+
+ Netherlands
+
+ |
10 GB |
$ 59.95 |
Accepted |
@@ -193,7 +233,11 @@
2011 |
- Germany |
+
+
+ Germany
+
+ |
1 GB |
Free |
No |
diff --git a/assets/img/icons/bromite.png b/assets/img/icons/bromite.png
new file mode 100644
index 00000000..73d7f940
Binary files /dev/null and b/assets/img/icons/bromite.png differ
diff --git a/assets/img/icons/duckduckgo.png b/assets/img/icons/duckduckgo.png
new file mode 100644
index 00000000..c9d83dcb
Binary files /dev/null and b/assets/img/icons/duckduckgo.png differ
diff --git a/assets/img/icons/onionbrowser.png b/assets/img/icons/onionbrowser.png
new file mode 100644
index 00000000..22a3a96d
Binary files /dev/null and b/assets/img/icons/onionbrowser.png differ
diff --git a/assets/img/tools/DNSCrypt-Proxy.png b/assets/img/tools/DNSCrypt-Proxy.png
new file mode 100644
index 00000000..ce6a09fc
Binary files /dev/null and b/assets/img/tools/DNSCrypt-Proxy.png differ
diff --git a/assets/img/tools/DNSCrypt.png b/assets/img/tools/DNSCrypt.png
deleted file mode 100644
index 5d51ca0e..00000000
Binary files a/assets/img/tools/DNSCrypt.png and /dev/null differ
diff --git a/source_code.md b/source_code.md
index cfda0ba3..a4f540a2 100644
--- a/source_code.md
+++ b/source_code.md
@@ -275,15 +275,11 @@ Raddle: https://gitlab.com/postmill
## Domain Name System (DNS)
+OpenNic: https://github.com/opennic/
+
Njalla: Non-free/Proprietary Software
-DNSCrypt: https://github.com/dnscrypt
-
-DNSCrypt-proxy: https://github.com/jedisct1/dnscrypt-proxy/
-
-OpenNic: https://github.com/opennic/ (mostly)
-
-Webpage: https://github.com/opennic/opennic-web
+DNSCrypt-Proxy: https://github.com/jedisct1/dnscrypt-proxy/
### Worth Mentioning
@@ -313,9 +309,11 @@ PowerDNS: https://github.com/PowerDNS/pdns
#### Local DNS servers
+- Namecoin: https://github.com/namecoin
+
- Stubby: https://github.com/getdnsapi/stubby
-- Namecoin: https://github.com/namecoin
+- Unbound: https://github.com/NLnetLabs/unbound
## Digital Notebook
Joplin: https://github.com/laurent22/joplin