diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index ee30fb33..26e4161f 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -24,9 +24,17 @@ We're trying to keep it simple and promote the best tools, not all of them.
There can be exceptions if no software is available that meet the criteria.
Note: This criteria applies to all of privacytools.io
-### Proividers
+### Providers
- Prioritize Products by privacy respecting nationality.
+### DNS
+
+- supports DoH or DoT (We love DNSCrypt, but there is already https://github.com/DNSCrypt/dnscrypt-resolvers which is directly supported by dnscrypt-proxy, so we don't consider useful to list providers only supporting it).
+- supports DNSSEC (https://dnssec.vs.uni-due.de/ can test your current DNS provider).
+- doesn't log IP addresses during normal operation (If your suggestion logs, please compare its privacy policy with other servers on our table that keep logs).
+- preferably supports QNAME minimization (if you have access to the dig command, `dig +short txt qnamemintest.internet.nl`)
+
+
### VPN
- Prioritize Products by privacy respecting nationality.
- Cannot be based in USA or UK.
diff --git a/_includes/cardv2.html b/_includes/cardv2.html
index de676e9a..3e8e590a 100644
--- a/_includes/cardv2.html
+++ b/_includes/cardv2.html
@@ -55,22 +55,22 @@
- {% if include.windows %}
{% endif %}
- {% if include.mac %}
{% endif %}
- {% if include.linux %}
{% endif %}
- {% if include.bsd %}
{% endif %}
+ {% if include.windows %}{% if include.windows != "" %}
{% else %}
{% endif %}{% endif %}
+ {% if include.mac %}{% if include.mac != "" %}
{% else %}
{% endif %}{% endif %}
+ {% if include.linux %}{% if include.linux != "" %}
{% else %}
{% endif %}{% endif %}
+ {% if include.bsd %}{% if include.bsd != "" %}
{% else %}
{% endif %}{% endif %}
- {% if include.firefox %}
{% endif %}
- {% if include.chrome %}
{% endif %}
- {% if include.safari %}
{% endif %}
- {% if include.opera %}
{% endif %}
- {% if include.edge %}
{% endif %}
+ {% if include.firefox %}{% if include.firefox != "" %}
{% else %}
{% endif %}{% endif %}
+ {% if include.chrome %}{% if include.chrome != "" %}
{% else %}
{% endif %}{% endif %}
+ {% if include.safari %}{% if include.safari != "" %}
{% else %}
{% endif %}{% endif %}
+ {% if include.opera %}{% if include.opera != "" %}
{% else %}
{% endif %}{% endif %}
+ {% if include.edge %}{% if include.edge != "" %}
{% else %}
{% endif %}{% endif %}
- {% if include.android %}
{% endif %}
- {% if include.ios %}
{% endif %}
- {% if include.fire %}
{% endif %}
+ {% if include.android %}{% if include.android != "" %}
{% else %}
{% endif %}{% endif %}
+ {% if include.ios %}{% if include.ios != "" %}
{% else %}
{% endif %}{% endif %}
+ {% if include.fire %}{% if include.fire != "" %}
{% else %}
{% endif %}{% endif %}
- {% if include.web %}
{% endif %}
+ {% if include.web %}{% if include.web != "" %}
{% else %}
{% endif %}{% endif %}
{{include.icon1}}
{{include.icon2}}
diff --git a/_includes/nav.html b/_includes/nav.html
index 5b71fad5..17115cc1 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -31,11 +31,11 @@
Browser
@@ -62,12 +62,12 @@
OS
diff --git a/_includes/sections/browser-addons.html b/_includes/sections/browser-addons.html
index 5e3f3d9f..7fb4028e 100644
--- a/_includes/sections/browser-addons.html
+++ b/_includes/sections/browser-addons.html
@@ -1,7 +1,7 @@
- Excellent Firefox Privacy Add-ons
+ Recommended Browser Add-ons
- Improve your privacy with these excellent Firefox add-ons.
+ Improve your privacy with these browser add-ons.
diff --git a/_includes/sections/browser-recommendation.html b/_includes/sections/browser-recommendation.html
index cf4195e3..32560d2e 100644
--- a/_includes/sections/browser-recommendation.html
+++ b/_includes/sections/browser-recommendation.html
@@ -1,4 +1,4 @@
- Browser Recommendation
+ Browser Recommendations
{% include cardv2.html
title="Mozilla Firefox"
@@ -17,7 +17,7 @@ bsd=""
%}
{% include cardv2.html
-title="Tor Browser - for anonymity"
+title="Tor Browser - Provides Anonymity"
image="/assets/img/tools/Tor-Browser.png"
description='Tor Browser is your choice if you need an extra layer of anonymity. It\'s a modified version of Firefox ESR, which comes with pre-installed privacy add-ons, encryption and an advanced proxy. How does Tor work?'
website="https://www.torproject.org/"
@@ -32,7 +32,7 @@ bsd=""
%}
{% include cardv2.html
-title="Brave Browser - Complete but Experimental"
+title="Brave Browser - Chromium Based"
image="/assets/img/tools/Brave.png"
description="The new open source browser Brave automatically blocks ads and trackers, making it faster and safer than your current browser. Brave is based on Chromium. experimental "
website="https://brave.com/"
diff --git a/_includes/sections/calendar-contacts-sync.html b/_includes/sections/calendar-contacts-sync.html
index 6a4ff713..86523946 100644
--- a/_includes/sections/calendar-contacts-sync.html
+++ b/_includes/sections/calendar-contacts-sync.html
@@ -40,10 +40,6 @@
fruux - a unified contacts/calendaring system that works across platforms and devices.
-
- Flock - a discontinued calendar and contacts sync service by Open Whisper Systems. Despite being shut down the source code is still available on GitHub.
-
-
cloud backups - consider regularly exporting your calendar and or contacts and backing them up on a separate storage drive or uploading them to cloud storage (ideally after encrypting them).
diff --git a/_includes/sections/dns.html b/_includes/sections/dns.html
index ded7b326..d8511966 100644
--- a/_includes/sections/dns.html
+++ b/_includes/sections/dns.html
@@ -27,14 +27,6 @@ forum="https://forum.privacytools.io/t/discussion-dnscrypt/340"
github="https://github.com/jedisct1/dnscrypt-proxy"
%}
-
Worth Mentioning
-
-
- - NoTrack - A network-wide DNS server which blocks Tracking sites. Currently works in Debian and Ubuntu.
- - Namecoin - A decentralized DNS open source information registration and transfer system based on the Bitcoin cryptocurrency.
- - Pi-hole - A network-wide DNS server for the Raspberry Pi. Blocks advertising and tracking domains for all devices on your network.
-
-
Encrypted ICANN DNS Providers
@@ -298,13 +290,12 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
- Firefox comes with built-in DoH support with Cloudflare set as the default resolver, but can be configured to use any DoH resolver. Currently Mozilla is conducting studies before enabling DoH by default for all US-based Firefox users.
- Android 9 comes with a DoT client by default.
- -
- DNSCloak - An open-source DNSCrypt and DoH client for iOS by
the Center for the Cultivation of Technology gemeinnuetzige GmbH.
-
- -
- Stubby - An open-source application for Linux, macOS, and Windows that acts as a local DNS Privacy stub resolver using DoT.
-
+ - DNSCloak - An open-source DNSCrypt and DoH client for iOS by
the Center for the Cultivation of Technology gemeinnuetzige GmbH.
+ - Pi-hole - A network-wide DNS server mainly for the Raspberry Pi. Blocks ads, tracking, and malicious domains for all devices on your network.
+ - NoTrack - A network-wide DNS server like Pi-hole for blocking ads, tracking, and malicious domains.
+ - Stubby - An open-source application for Linux, macOS, and Windows that acts as a local DNS Privacy stub resolver using DoT.
+ - Namecoin - A decentralized DNS open-source information registration and transfer system based on the Bitcoin cryptocurrency.
- QNAME Minimization and Your Privacy by the Internet Systems Consortium (ISC)
- DNSSEC and BIND 9 by the ISC
-
\ No newline at end of file
+
diff --git a/_includes/sections/email-providers.html b/_includes/sections/email-providers.html
index 74c17fe8..afff5560 100644
--- a/_includes/sections/email-providers.html
+++ b/_includes/sections/email-providers.html
@@ -8,7 +8,7 @@
- Email Provider |
+ Email Provider |
Website |
Since |
Jurisdiction |
@@ -23,7 +23,104 @@
-
+ |
+
+ |
+
+
+ |
+ 2015 |
+ Netherlands |
+ 1 GB |
+ Free |
+ Accepted |
+ Built-in |
+ Yes |
+
+
+
+
+
+ |
+
+
+ |
+ 2010 |
+ Switzerland |
+ 2 GB |
+ $ 60 |
+ Accepted |
+ No |
+ Yes |
+
+
+
+
+
+
+ |
+
+
+ |
+ 2014 |
+ Germany |
+ 2 GB |
+ 12 € |
+ Accepted |
+ Built-in |
+ Yes |
+
+
+
+
+
+ |
+
+
+ |
+ 2013 |
+ Belgium |
+ 500 MB |
+ Free |
+ Accepted |
+ Built-in |
+ Yes |
+
+
+
+
+
+ |
+
+
+ |
+ 2003 |
+ Switzerland |
+ 1 GB |
+ $ 49.95 |
+ Accepted |
+ Built-in |
+ Yes |
+
+
+
+
+
+ |
+
+
+ |
+ 2009 |
+ Germany |
+ 2 GB |
+ 12 € |
+ No |
+ Built-in |
+ No |
+
+
+
+
|
@@ -40,23 +137,56 @@
|
-
-
+ |
+
+
|
-
+
+ |
+ 1999 |
+ Norway |
+ 1 GB |
+ $ 19.95 |
+ Accepted |
+ No |
+ Yes |
+
+
+
+
+
+ |
+
+
|
2015 |
Netherlands |
- 2 GB |
- Free |
- Accepted |
+ 25 GB |
+ 29 € |
+ No |
+ No |
+ Yes |
+
+
+
+
+
+ |
+
+
+ |
+ 2014 |
+ Netherlands |
+ 10 GB |
+ $ 59.95 |
+ Accepted |
Built-in |
Yes |
-
+ |
|
@@ -71,136 +201,6 @@
| Yes |
-
-
-
- |
-
-
- |
- 2013 |
- Belgium |
- 500 MB |
- Free |
- Accepted |
- Built-in |
- Yes |
-
-
-
-
-
-
- |
-
-
- |
- 2014 |
- Germany |
- 2 GB |
- 12 € |
- Accepted |
- Built-in |
- Yes |
-
-
-
-
-
- |
-
-
- |
- 2009 |
- Germany |
- 2 GB |
- 12 € |
- No |
- Built-in |
- No |
-
-
-
-
-
-
- |
-
-
- |
- 1999 |
- Norway |
- 1 GB |
- $ 19.95 |
- Accepted |
- No |
- Yes |
-
-
-
-
-
- |
-
-
- |
- 2003 |
- Switzerland |
- 1 GB |
- $ 49.95 |
- Accepted |
- Built-in |
- Yes |
-
-
-
-
-
- |
-
-
- |
- 2015 |
- Netherlands |
- 25 GB |
- 29 € |
- No |
- No |
- Yes |
-
-
-
-
-
- |
-
-
- |
- 2014 |
- Netherlands |
- 10 GB |
- $ 59.95 |
- Accepted |
- Built-in |
- Yes |
-
-
-
-
-
- |
-
-
- |
- 2010 |
- Switzerland |
- 2 GB |
- $ 60 |
- Accepted |
- No |
- Yes |
-
-
diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html
index a8c6c552..e7976ce8 100644
--- a/_includes/sections/instant-messenger.html
+++ b/_includes/sections/instant-messenger.html
@@ -58,7 +58,6 @@ web=""
- Kontalk - A community-driven instant messaging network. Supports end-to-end encryption. Both client-to-server and server-to-server channels are fully encrypted.
- Keybase - Warning End-to-end encrypted messaging with social verification.
- Status - Experimental A free and open-source, peer-to-peer, encrypted instant messanger with support for DAPPs.
- - Ricochet - Danger Experimental Ricochet uses the Tor network to reach your contacts without relying on messaging servers. It creates a hidden service, which is used to rendezvous with your contacts without revealing your location or IP address.
- Tox - Experimental A free and open-source, peer-to-peer, encrypted instant messaging and video calling software. VoIP
- Jami (formerly Ring/SFLphone) - Gives you full control over your communications and an unmatched level of privacy. Jami has text messaging, video and audio calls, file transfer, video conferencing. VoIP
@@ -67,7 +66,6 @@ web=""
Related Information
-
- Updating the Tor binary included with Ricochet
-
-Currently there are no known vulnerabilities with Ricochet. The software is safe to use as long as you update the included Tor binary to the latest version.
-
-
- - Download the Tor Browser.
- - Run the Tor Browser installer or extract package for your platform. Windows (.exe), MacOSX (.dmg) and Linux (.tar.bz2).
- - Copy the Tor binary or create a symbolic link to it:
-
-
- - Windows: Copy the Tor binary included with the Tor Browser and overwrite the old one included with Ricochet.
-
- - Tor Browser binary:
%HOMEPATH%\Desktop\Tor Browser\Browser\TorBrowser\Tor\tor.exe
- - Ricochet's included binary:
%HOMEPATH%\Desktop\Ricochet\tor.exe
-
-
- - MacOSX: Assuming you copied the
Tor Browser.app and Ricochet.app from their respective .dmg install media to /Applications :
- Create a symbolic link to the Tor binary in Terminal. Ricochet will continue to use the up to date version of the Tor binary when you update the Tor Browser Bundle.
-
- rm ~/Applications/Ricochet.app/Contents/MacOS/tor
- ln -s ~/Applications/Tor\ Browser.app/Contents/Resources/TorBrowser/Tor/tor \
- ~/Applications/Ricochet.app/Contents/MacOS/tor
-
-
-
- - Linux: Assuming you extracted the Tor Browser Bundle and Ricochet tarball to your home directory:
-
- rm ~/ricochet/tor
- ln -s ~/tor-browser_en-US/Browser/TorBrowser/Tor/tor ~/ricochet/tor
-
-
-
diff --git a/_includes/sections/mobile-operating-systems.html b/_includes/sections/mobile-operating-systems.html
index 7c935c6f..ebe47849 100644
--- a/_includes/sections/mobile-operating-systems.html
+++ b/_includes/sections/mobile-operating-systems.html
@@ -39,5 +39,5 @@ github="https://github.com/ubports"
- Replicant AOSP - An open-source operating system based on Android, aiming to replace all proprietary components with free software.
- OmniROM AOSP contrib - A free software operating system for smartphones and tablet computers, based on the Android mobile platform.
- - MicroG Add-on Package contrib - A project that aims to reimplement the proprietary Google Play Services in the Android operating system with a FLOSS replacement.
+
- MicroG Add-on Package contrib - A project that aims to reimplement the proprietary Google Play Services in the Android operating system with a FLOSS replacement. The microG project also maintains a fork of LineageOS with microG and F-Droid preinstalled at Lineage for microG.
diff --git a/_includes/sections/vpn.html b/_includes/sections/vpn.html
index 5a8ad57b..0a60c024 100644
--- a/_includes/sections/vpn.html
+++ b/_includes/sections/vpn.html
@@ -20,96 +20,6 @@
|
-
-
-  |
-
-
- |
- 2010 |
- 54 € |
- Yes |
- 162 |
- No |
- Italy |
-
-
-
-
-
- |
-
-
- |
- 2012 |
- 45 € |
- Yes |
- 22 |
- Yes |
- Sweden |
-
-
-
-
-
- |
-
-
- |
- 2009 |
- 49 € |
- Yes |
- 31 |
- No |
- Hong Kong |
-
-
-
-
-
- |
-
-
-
- |
- 2009 |
- $ 99.95 |
- Yes |
- 148 |
- No |
- British Virgin Islands |
-
-
-
-
-
- |
-
-
- |
- 2014 |
- $ 35.88 |
- No |
- 27 |
- No |
- Sweden |
-
-
-
-
-
- |
-
-
- |
- 2012 |
- Free |
- Yes |
- 160+ |
- No |
- Malaysia |
-
-
@@ -156,36 +66,6 @@
| Panama |
-
-
-
- |
-
-
- |
- 2014 |
- 84 € |
- Yes |
- 67 |
- No |
- Sweden |
-
-
-
-
-
- |
-
-
- |
- 2008 |
- 119.99 € |
- No |
- 54 |
- No |
- Switzerland |
-
-
@@ -200,65 +80,6 @@
| No |
Switzerland |
-
-
-
-
- |
-
-
- |
- 2012 |
- $ 40 |
- No |
- 300+ |
- No |
- Seychelles |
-
-
-
-
-
- |
-
-
- |
- 2014 |
- $ 39.95 |
- Yes |
- 164 |
- No |
- Seychelles |
-
-
-
-
- |
-
-
- |
- 2014 |
- $ 59 |
- Yes |
- 204 |
- No |
- Bulgaria |
-
-
-
-
- |
-
-
- |
- 2014 |
- 35.88 € |
- No |
- 800+ |
- No |
- Seychelles |
-
-
diff --git a/assets/img/provider/AirVPN.png b/assets/img/provider/AirVPN.png
deleted file mode 100644
index d2d3b6a6..00000000
Binary files a/assets/img/provider/AirVPN.png and /dev/null differ
diff --git a/assets/img/provider/AzireVPN.png b/assets/img/provider/AzireVPN.png
deleted file mode 100644
index c63aefd7..00000000
Binary files a/assets/img/provider/AzireVPN.png and /dev/null differ
diff --git a/assets/img/provider/EarthVPN.png b/assets/img/provider/EarthVPN.png
deleted file mode 100644
index e74c040b..00000000
Binary files a/assets/img/provider/EarthVPN.png and /dev/null differ
diff --git a/assets/img/provider/ExpressVPN.png b/assets/img/provider/ExpressVPN.png
deleted file mode 100644
index 11254fc2..00000000
Binary files a/assets/img/provider/ExpressVPN.png and /dev/null differ
diff --git a/assets/img/provider/FrootVPN.png b/assets/img/provider/FrootVPN.png
deleted file mode 100644
index f9e34812..00000000
Binary files a/assets/img/provider/FrootVPN.png and /dev/null differ
diff --git a/assets/img/provider/Perfect-Privacy.png b/assets/img/provider/Perfect-Privacy.png
deleted file mode 100644
index 784bcf40..00000000
Binary files a/assets/img/provider/Perfect-Privacy.png and /dev/null differ
diff --git a/assets/img/provider/Proxy.sh.png b/assets/img/provider/Proxy.sh.png
deleted file mode 100644
index 37ee777c..00000000
Binary files a/assets/img/provider/Proxy.sh.png and /dev/null differ
diff --git a/assets/img/provider/Trust.Zone.png b/assets/img/provider/Trust.Zone.png
deleted file mode 100644
index 10ab9bf6..00000000
Binary files a/assets/img/provider/Trust.Zone.png and /dev/null differ
diff --git a/assets/img/provider/VPN.ht.png b/assets/img/provider/VPN.ht.png
deleted file mode 100644
index 12885d5c..00000000
Binary files a/assets/img/provider/VPN.ht.png and /dev/null differ
diff --git a/assets/img/provider/VPNTunnel.png b/assets/img/provider/VPNTunnel.png
deleted file mode 100644
index 69985710..00000000
Binary files a/assets/img/provider/VPNTunnel.png and /dev/null differ
diff --git a/assets/img/provider/blackVPN.png b/assets/img/provider/blackVPN.png
deleted file mode 100644
index e902b78c..00000000
Binary files a/assets/img/provider/blackVPN.png and /dev/null differ
diff --git a/assets/img/provider/hide.me.png b/assets/img/provider/hide.me.png
deleted file mode 100644
index 1c95f481..00000000
Binary files a/assets/img/provider/hide.me.png and /dev/null differ
diff --git a/assets/img/provider/ovpn.png b/assets/img/provider/ovpn.png
deleted file mode 100644
index 9145982d..00000000
Binary files a/assets/img/provider/ovpn.png and /dev/null differ
diff --git a/assets/img/provider/vpnarea.png b/assets/img/provider/vpnarea.png
deleted file mode 100644
index ccbffa48..00000000
Binary files a/assets/img/provider/vpnarea.png and /dev/null differ
diff --git a/pages/old.html b/pages/old.html
index 07adabf6..9c45421e 100644
--- a/pages/old.html
+++ b/pages/old.html
@@ -41,6 +41,8 @@ permalink: /classic/
{% include sections/voice-video-messenger.html %}
+{% include sections/teamchat.html %}
+
{% include sections/file-sharing.html %}
{% include sections/cloud-storage.html %}
diff --git a/source_code.md b/source_code.md
index 21049fc3..8f0853f4 100644
--- a/source_code.md
+++ b/source_code.md
@@ -134,8 +134,6 @@ Backend: closed-source
Status.im: https://github.com/status-im
- Ricochet: https://github.com/ricochet-im/ricochet
-
Tox: https://github.com/TokTok/c-toxcore
Ring/Jami: https://git.jami.net/savoirfairelinux
|