.github/ISSUE_TEMPLATE/7_DNS_provider.md

@@ -0,0 +1,36 @@
+---
+name: "🗄️ encrypted DNS provider suggestion"
+about: Suggest a new encrypted DNS provider.
+title: "🗄️ DNS provider suggestion | "
+labels: 🌐 website issue, 🗄️ DNS
+---
+
+<!-- Please feel free to overwrite these comments -->
+
+## Basic Information
+
+**Name:** 
+**Filtering:** <!-- What is being filtered? Is it opt-in with separate address or not? -->
+**Privacy policy:** <!-- Link, especially when there is logging -->
+**Protocols:** <!-- at least DoH or DoT? DNSCrypt? -->
+**Server/Location:** <!-- Where is the provider based? Where are their servers located? Anycast if there are multiple servers answering to the same address -->
+**Source:** <!-- link to the source code, preferred, but optional -->
+**Type:** <!-- Non-profit, commercial, hobby project? -->
+**Website:** 
+
+## Description
+
+<!-- Why should we list your suggestion? Anything else, that you wish us to know? -->
+
+
+### Required features:
+
+<!-- DoH and DoT are supported natively by platforms like Firefox and Android 9+ -->
+
+* [ ] 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. -->
+
+#### Desired features
+
+* [ ] supports QNAME minimization <!-- if you have access to the dig command, `dig +short txt qnamemintest.internet.nl` -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,10 +2,16 @@
 
 ## Description
 
-Resolves: #none <!-- The number of the issue that is resolved by this pull request. If there is none, feel free to delete this line -->
+Resolves: #none <!-- The number of the issue that is resolved by this pull request. If there is none, feel free to delete this line 
 
-<!--
-## Screenshots
+#### Check List <!-- Please add an x in each box below, like so: [x] -->
 
-Please add screenshots if applicable
--->
+- [ ] I have read and understand [CONTRIBUTING.md](https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md).
+
+- [ ] I have listed the source code for this project in [source_code.md](https://github.com/privacytoolsIO/privacytools.io/blob/master/source_code.md).
+
+- [ ] This project is [free/libre software](https://www.wikipedia.org/wiki/Free_software).
+
+- [ ] This project has an [associated discussion](https://github.com/privacytoolsIO/privacytools.io/issues).
+
+Code Repository (if applicable): 

_includes/cardv2.html

@@ -7,41 +7,45 @@
       <img src="{{include.image}}" height="120" width="120" class="panel-pic" alt="{{include.title}}">
       {{include.description}}
     </p>
-    <a href="{{include.website}}" class="btn btn-primary"><i class="fas fa-external-link-alt fa-fw"></i> Website</a>
-    {% if include.forum %}
-    <a href="{{include.forum}}" class="btn btn-success"><i class="fab fa-discourse fa-fw"></i> Forum</a>
-    {% endif %}
-    {% if include.tor %}
-    <a class="mb-1" data-toggle="tooltip" data-placement="bottom" data-original-title="Requires specific software to access: torproject.org" href="{{include.tor}}"><img alt="Tor" src="/assets/img/layout/tor.png" width="35" height="35"></a>
-    {% endif %}
+    <div class="d-flex justify-content-between flex-column flex-md-row align-items-start align-items-md-center">
+      <div class="flex-shrink-0 mr-2">
+        <a href="{{include.website}}" class="btn btn-primary mt-1"><i class="fas fa-external-link-alt fa-fw"></i> Website</a>
+        {% if include.forum %}
+        <a href="{{include.forum}}" class="btn btn-success mt-1"><i class="fab fa-discourse fa-fw"></i> Forum</a>
+        {% endif %}
+        {% if include.tor %}
+        <a data-toggle="tooltip" data-placement="bottom" data-original-title="Requires specific software to access: torproject.org" href="{{include.tor}}"><img class="mt-2" alt="Tor" src="/assets/img/layout/tor.png" width="35" height="35"></a>
+        {% endif %}
+      </div>
 
-    <div class="float-right">
-        {% if include.windows %}<i class="fab fa-windows fa-2x fa-fw"></i>{% endif %}
-        {% if include.mac %}<i class="fab fa-apple fa-2x fa-fw"></i>{% endif %}
-        {% if include.linux %}<i class="fab fa-linux fa-2x fa-fw"></i>{% endif %}
-        {% if include.bsd %}<i class="fab fa-freebsd fa-2x fa-fw"></i>{% endif %}
+      <div class="mt-2">
+          {% if include.windows %}<i class="fab fa-windows fa-2x fa-fw d-inline pr-1"></i>{% endif %}
+          {% if include.mac %}<i class="fab fa-apple fa-2x fa-fw d-inline pr-1"></i>{% endif %}
+          {% if include.linux %}<i class="fab fa-linux fa-2x fa-fw d-inline pr-1"></i>{% endif %}
+          {% if include.bsd %}<i class="fab fa-freebsd fa-2x fa-fw d-inline pr-1"></i>{% endif %}
 
-        {% if include.firefox %}<i class="fab fa-firefox fa-2x fa-fw"></i>{% endif %}
-        {% if include.chrome %}<i class="fab fa-chrome fa-2x fa-fw"></i>{% endif %}
-        {% if include.safari %}<i class="fab fa-safari fa-2x fa-fw"></i>{% endif %}
-        {% if include.opera %}<i class="fab fa-opera fa-2x fa-fw"></i>{% endif %}
-        {% if include.edge %}<i class="fab fa-edge fa-2x fa-fw"></i>{% endif %}
+          {% if include.firefox %}<i class="fab fa-firefox fa-2x fa-fw d-inline pr-1"></i>{% endif %}
+          {% if include.chrome %}<i class="fab fa-chrome fa-2x fa-fw d-inline pr-1"></i>{% endif %}
+          {% if include.safari %}<i class="fab fa-safari fa-2x fa-fw d-inline pr-1"></i>{% endif %}
+          {% if include.opera %}<i class="fab fa-opera fa-2x fa-fw d-inline pr-1"></i>{% endif %}
+          {% if include.edge %}<i class="fab fa-edge fa-2x fa-fw d-inline pr-1"></i>{% endif %}
 
-        {% if include.android %}<i class="fab fa-android fa-2x fa-fw"></i>{% endif %}
-        {% if include.ios %}<i class="fab fa-app-store-ios fa-2x fa-fw"></i>{% endif %}
-        {% if include.fire %}<i class="fas fa-fire fa-2x fa-fw"></i>{% endif %}
+          {% if include.android %}<i class="fab fa-android fa-2x fa-fw d-inline pr-1"></i>{% endif %}
+          {% if include.ios %}<i class="fab fa-app-store-ios fa-2x fa-fw d-inline pr-1"></i>{% endif %}
+          {% if include.fire %}<i class="fas fa-fire fa-2x fa-fw d-inline pr-1"></i>{% endif %}
 
-        {% if include.web %}<i class="fas fa-desktop fa-2x fa-fw"></i>{% endif %}
+          {% if include.web %}<i class="fas fa-desktop fa-2x fa-fw d-inline pr-1"></i>{% endif %}
 
-        {{include.icon1}}
-        {{include.icon2}}
-        {{include.icon3}}
+          {{include.icon1}}
+          {{include.icon2}}
+          {{include.icon3}}
 
-        {% if include.github %}<a href="{{include.github}}"><i class="fab fa-github fa-2x fa-fw"></i></a>{% endif %}
-        {% if include.gitlab %}<a href="{{include.gitlab}}"><i class="fab fa-gitlab fa-2x fa-fw"></i></a>{% endif %}
-        {% if include.git %}<a href="{{include.git}}"><i class="fab fa-git-square fa-2x fa-fw"></i></a>{% endif %}
-        {% if include.source %}<a href="{{include.source}}"><i class="fas fa-code-branch fa-2x fa-fw"></i></a>{% endif %}
+          {% if include.github %}<a href="{{include.github}}"><i class="fab fa-github fa-2x fa-fw d-inline"></i></a>{% endif %}
+          {% if include.gitlab %}<a href="{{include.gitlab}}"><i class="fab fa-gitlab fa-2x fa-fw d-inline"></i></a>{% endif %}
+          {% if include.git %}<a href="{{include.git}}"><i class="fab fa-git-square fa-2x fa-fw d-inline"></i></a>{% endif %}
+          {% if include.source %}<a href="{{include.source}}"><i class="fas fa-code-branch fa-2x fa-fw d-inline"></i></a>{% endif %}
 
+      </div>
     </div>
 
   </div>

_includes/footer.html

@@ -72,7 +72,7 @@
 
   <div class="copyright-text">
     <p><strong>{% t footer.no_ads %}</strong> <em>{% t footer.socially_motivated %}</em> <a href="/privacy-policy/">{% t footer.privacy_policy %}</a>.</p>
-    <p>Tor v3: <strong>privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd.onion</strong> (<a href="https://write.privacytools.io/jonah/tor-on-privacytools-io">{% t footer.learn_more %}</a>)</p>
+    <p class="text-left">Tor v3: <strong>privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd.onion</strong> (<a href="https://write.privacytools.io/jonah/tor-on-privacytools-io">{% t footer.learn_more %}</a>)</p>
   </div>
 
 </footer>

_includes/nav.html

@@ -22,6 +22,7 @@
             <a class="dropdown-item" href="/providers/paste/"><i class="fas fa-paste fa-fw"></i> {% t provider.pastebins %}</a>
             <a class="dropdown-item" href="/providers/search-engines/"><i class="fab fa-searchengin fa-fw"></i> {% t provider.search_engines %}</a>
             <a class="dropdown-item" href="/providers/social-networks/"><i class="fas fa-expand-arrows-alt fa-fw"></i> {% t provider.social_networks %}</a>
+            <a class="dropdown-item" href="/providers/social-news-aggregator/"><i class="far fa-newspaper fa-fw"></i> {% t provider.news_aggregators %}</a>
             <a class="dropdown-item" href="/providers/vpn/"><i class="far fa-eye-slash fa-fw"></i> {% t provider.vpn %}</a>
           </div>
         </li>
@@ -42,12 +43,14 @@
             {% t software.software %}
           </a>
           <div class="dropdown-menu" aria-labelledby="softwareDropdown">
+            <a class="dropdown-item" href="/software/calendar-contacts/"><i class="fas fa-calendar fa-fw"></i> {% t software.cal_card %}</a>
             <a class="dropdown-item" href="/software/notebooks/"><i class="far fa-sticky-note fa-fw"></i> {% t software.notebook %}</a>
             <a class="dropdown-item" href="/software/email/#messaging"><i class="fas fa-random fa-fw"></i> {% t software.email_alt %}</a>
             <a class="dropdown-item" href="/software/email/"><i class="fas fa-envelope fa-fw"></i> {% t software.email_clients %}</a>
             <a class="dropdown-item" href="/software/encryption-tools/"><i class="fas fa-lock fa-fw"></i> {% t software.file_encryption %}</a>
             <a class="dropdown-item" href="/software/file-sharing/"><i class="fas fa-file-export fa-fw"></i> {% t software.file_sharing %}</a>
             <a class="dropdown-item" href="/software/im/"><i class="fab fa-telegram-plane fa-fw"></i> {% t software.im %}</a>
+            <a class="dropdown-item" href="/software/teamchat/"><i class="fas fa-users fa-fw"></i> {% t software.team_chat %}</a>
             <a class="dropdown-item" href="/software/passwords/"><i class="fas fa-user-lock fa-fw"></i> {% t software.password_managers %}</a>
             <a class="dropdown-item" href="/software/productivity/"><i class="fas fa-briefcase fa-fw"></i> {% t software.productivity %}</a>
             <a class="dropdown-item" href="/software/file-sync/"><i class="fas fa-copy fa-fw"></i> {% t software.file_sync %}</a>

_includes/sections/android-addons.html

@@ -7,7 +7,7 @@
 <div class="container-fluid">
 
   <div class="row mb-2">
-    <div class="col-lg-3 col-sm-12">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
       <img src="/assets/img/addons/Blokada.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="Blokada">
     </div>
     <div class="col">
@@ -17,7 +17,7 @@
   </div>
 
   <div class="row mb-2">
-    <div class="col-lg-3 col-sm-12">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
       <img src="/assets/img/addons/netguard.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="NetGuard">
     </div>
     <div class="col">
@@ -27,7 +27,7 @@
   </div>
 
   <div class="row mb-2">
-    <div class="col-lg-3 col-sm-12">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
       <img src="/assets/img/addons/Orbot.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="Orbot">
     </div>
     <div class="col">
@@ -36,21 +36,4 @@
     </div>
   </div>
 
-</div>
-
-<div class="alert alert-warning" role="alert">
-  <strong>The following add-ons require root access, which makes your device more vulnerable. Proceed with caution.</strong>
-</div>
-
-<div class="container-fluid">
-  <div class="row mb-2">
-    <div class="col-lg-3 col-sm-12">
-      <img src="/assets/img/addons/xprivacylua.png" class="img-fluid d-block mr-auto ml-auto align-middle" alt="XPrivacyLua">
-    </div>
-    <div class="col">
-      <h3>Manage your apps' permissions with <a href="https://lua.xprivacy.eu/">XPrivacyLua</a></h3>
-      <p>Revoking Android permissions from apps often let apps crash or malfunction. <strong>XPrivacyLua</strong> solves this by feeding apps fake data instead of real data.</p>
-      <p>Requirements: <a href="https://forum.xda-developers.com/apps/magisk/official-magisk-v7-universal-systemless-t3473445">Magisk (xda-developers)</a>, <a href="https://forum.xda-developers.com/xposed">Xposed Framework (xda-developers)</a></p>
-    </div>
-  </div>
 </div>

_includes/sections/browser-addons.html

@@ -106,7 +106,7 @@ image="/assets/img/addons/snowflake.png"
 description=descr7
 website="https://snowflake.torproject.org"
 forum="https://forum.privacytools.io/t/discussion-snowflake/1146"
-github="https://gitweb.torproject.org/pluggable-transports/snowflake.git"
+git="https://gitweb.torproject.org/pluggable-transports/snowflake.git"
 firefox=""
 chrome=""
 %}

_includes/sections/browser-recommendation.html

@@ -17,9 +17,9 @@ bsd=""
 %}
 
 {% include cardv2.html
-title="Tor Browser - For Experts"
+title="Tor Browser - for anonymity"
 image="/assets/img/tools/Tor-Browser.png"
-description='Tor Browser is your choice if you need an extra layer of anonymity. Its a modified version of Firefox, it comes with pre-installed privacy add-ons, encryption and an advanced proxy. <a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-1-myth-busting-tor">How does Tor work?</a>'
+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. <a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-1-myth-busting-tor">How does Tor work?</a>'
 website="https://www.torproject.org/"
 forum="https://forum.privacytools.io/t/discussion-tor-browser/278"
 git="https://trac.torproject.org/projects/tor"
@@ -43,4 +43,4 @@ mac=""
 linux=""
 android=""
 ios=""
-%}
+%}

_includes/sections/browser-tweaks.html

@@ -118,6 +118,24 @@
   </ul>
   </dd>
 
+  <dt>network.trr.mode = 2</dt>
+  <dd>
+  Use Trusted Recursive Resolver (DNS-over-HTTPS) first and if it fails, use the system resolver <a href="https://wiki.mozilla.org/Trusted_Recursive_Resolver">Source</a>
+  <ul>
+    <li>0 = disabled by default, may change in the future</li>
+    <li>1 = use the faster resolver</li>
+    <li>2 = use DoH first, fallback to system resolver</li>
+    <li>3 = only use DoH. This may require <code>network.trr.bootstrapAddress</code> or using an IP address in <code>network.trr.uri</code>.</li>
+    <li>5 = explicitly disable DoH</li>
+  </ul>
+  </dd>
+
+  <dt>network.trr.uri = CHANGEME</dt>
+  <dd>The address of your DNS-over-HTTPS provider, if you don't have one, <a href="/providers/dns/#icanndns">check our encrypted DNS recommendations</a>. It can also be changed in <em>Settings, Network Settings, Enable DNS over HTTPS, Use Provider, Custom</em>.</dd>
+
+  <dt>network.security.esni.enabled = true</dt>
+  <dd>Hide the address which you are requesting SSL certificate for if the server supports it. This <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1500289">requires DoH/TRR to be enabled</a> even <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1542754">on Android 9+ when Private DNS is enabled</a>.</dd>
+
   <dt>webgl.disabled = true</dt>
   <dd>WebGL is a potential security risk. <a href="https://security.stackexchange.com/questions/13799/is-webgl-a-security-concern">Source</a></dd>
 

_includes/sections/dns.html

@@ -33,10 +33,278 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
   <li><a href="https://gitlab.com/quidsup/notrack">NoTrack</a> - A network-wide DNS server which blocks Tracking sites. Currently works in Debian and Ubuntu.</li>
   <li><a href="https://namecoin.info/">Namecoin</a> - A decentralized DNS open source information registration and transfer system based on the Bitcoin cryptocurrency.</li>
   <li><a href="https://pi-hole.net/">Pi-hole</a> - A network-wide DNS server for the Raspberry Pi.  Blocks advertising and tracking domains for all devices on your network.</li>
-  <li id="icanndns">ICANN DNS resolvers with support for encrypted DNS</li>
-  <ul>
-    <li><a href="https://adguard.com/en/adguard-dns/overview.html">AdGuard DNS</a> - A commercial, anycast DNS resolver with ad-blocking and support for DNS over HTTPS (DoH), DNS over TLS (DoT), and DNSCrypt. <span class="badge badge-warning" data-toggle="tooltip" title="Uses Cloudflare, no DNSSEC, for-profit (in Cyprus)">Warnings <i class="far fa-question-circle"></i></a></span></li>
-    <li><a href="https://blahdns.com/">BlahDNS</a> - A small hobby ad-blocking DNS project with DoH, DoT, and DNSCrypt support. Servers located in Switzerland, Japan, and Germany. <span class="badge badge-warning" data-toggle="tooltip" title="'Use at your own risk.', uses Cloudflare">Warnings <i class="far fa-question-circle"></i></a></span></li>
-    <li><a href="https://powerdns.org/">PowerDNS</a> - A best effort DoH service. Servers located in the Netherlands.</li>
-    <li><a href="https://quad9.net/">Quad9 DNS</a> - A non-profit, anycast DNS provider founded by <a href="https://www-03.ibm.com/press/us/en/pressrelease/53388.wss">IBM</a>, <a href="https://www.pch.net/">PCH</a>, and <a href=https://www.globalcyberalliance.org/quad9/"">Global Cyber Alliance</a>. Provides malicious domain filtering and supports DoH, DoT, and DNSCrypt. <span class="badge badge-warning" data-toggle="tooltip" title="Founders of Global Cyber Alliance include: City of London Police & Manhattan District Attorney's Office">Warnings <i class="far fa-question-circle"></i></a></span></li>
 </ul>
+
+<h1 id="icanndns" class="anchor"><a href="#icanndns"><i class="fas fa-link anchor-icon"></i></a> Encrypted ICANN DNS Providers</h1>
+
+<div class="alert alert-warning" role="alert">
+  <strong>Note: Using an encrypted DNS resolver will not make you anonymous, nor hide your internet traffic from your Internet Service Provider. But it will prevent DNS hijacking, and make your DNS requests harder for third parties to eavesdrop on and tamper with. If you are currently using Google's DNS resolver, you should pick an alternative here.</strong>
+</div>
+
+<div class="table-responsive">
+  <table class="table sortable-theme-bootstrap" data-sortable>
+    <thead>
+      <tr>
+        <th data-sorted="true" data-sorted-direction="descending">ICANN DNS Provider</th>
+        <th data-sortable="true">Server Locations</th>
+        <th data-sortable="false">Privacy Policy</th>
+        <th data-sortable="true">Type</th>
+        <th data-sortable="true">Logging</th>
+        <th data-sortable="true">Protocols</th>
+        <th data-sortable="true">DNSSEC</th>
+        <th data-sortable="true">QNAME Minimization</th>
+        <th data-sortable="true">Filtering</th>
+        <th data-sortable="true">Source Code</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td data-value="AdGuard">
+          <a href="https://adguard.com/en/adguard-dns/overview.html">AdGuard</a>
+        </td>
+        <td>Anycast (based in <span class="flag-icon flag-icon-cy"></span> Cyprus)</td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://adguard.com/en/privacy/dns.html" href="https://adguard.com/en/privacy/dns.html">
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          </a>
+        </td>
+        <td>Commercial</td>
+        <td>No</td>
+        <td>DoH, DoT, DNSCrypt</td>
+        <td>Yes</td>
+        <td>Yes</td>
+        <td>Ads, trackers, malicious domains</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>
+      </tr>
+
+      <tr>
+        <td data-value="BlahDNS">
+          <a href="https://blahdns.com/">BlahDNS</a>
+        </td>
+        <td><span class="flag-icon flag-icon-ch"></span> Switzerland, <span class="flag-icon flag-icon-jp"></span> Japan, <span class="flag-icon flag-icon-de"></span> Germany</td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title='"No logs."'>
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          </a>
+        </td>
+        <td>Hobby Project</td>
+        <td>No</td>
+        <td>DoH, DoT, DNSCrypt</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>
+          <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>
+      </tr>
+
+      <tr>
+        <td data-value="Cloudflare">
+          <a href="https://developers.cloudflare.com/1.1.1.1/setting-up-1.1.1.1/">Cloudflare</a> <span class="badge badge-warning" data-toggle="tooltip" title="Cloudflare is one of the world's largest networks, and a problem considering anonymity and decentralization."><a href="https://codeberg.org/crimeflare/cloudflare-tor/"><i class="fas fa-exclamation-triangle"></i></a></span>
+        </td>
+        <td>Anycast (based in <span class="flag-icon flag-icon-us"></span> US)</td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.cloudflare.com/privacypolicy/" href="https://www.cloudflare.com/privacypolicy/">
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          </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>DoH, DoT, DNSCrypt</td>
+        <td>Yes</td>
+        <td>Yes</td>
+        <td>No</td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://github.com/cloudflare/dns" href="https://github.com/cloudflare/dns">
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          </a>
+        </td>
+      </tr>
+
+      <tr>
+        <td data-value="CZ.NIC">
+          <a href="https://www.nic.cz/odvr/">CZ.NIC</a>
+        </td>
+        <td><span class="flag-icon flag-icon-cz"></span> Czech Republic</td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title='"CZ.NIC resolvers neither collect any personal data nor gather information on pages where your computer sends personal data."'>
+            <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='"CZ.NIC is an interest association of legal entities, founded in 1998 by leading providers of Internet services."' href="https://www.nic.cz/page/351/about-association/">Association</a></td>
+        <td>No</td>
+        <td>DoH, DoT</td>
+        <td>Yes</td>
+        <td>Yes</td>
+        <td data-value="No">?</td>
+        <td>?</td>
+      </tr>
+
+      <tr>
+        <td data-value="dnswarden">
+          <a href="https://github.com/bhanupratapys/dnswarden/blob/master/README.md">dnswarden</a>
+        </td>
+        <td><span class="flag-icon flag-icon-de"></span> Germany</td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://github.com/bhanupratapys/dnswarden/blob/master/README.md#privacy-policy-and-tc" href="https://github.com/bhanupratapys/dnswarden/blob/master/README.md#privacy-policy-and-tc">
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          </a>
+        </td>
+        <td>Hobby Project</td>
+        <td>No</td>
+        <td>DoH, DoT, DNSCrypt</td>
+        <td>Yes</td>
+        <td>Yes</td>
+        <td>Based on server choice</td>
+        <td>?</td>
+      </tr>
+
+      <tr>
+        <td data-value="Foundation for Applied Privacy">
+          <a href="https://appliedprivacy.net/services/dns/">Foundation for Applied Privacy</a>
+        </td>
+        <td><span class="flag-icon flag-icon-at"></span> Austria</td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://appliedprivacy.net/privacy-policy" href="https://appliedprivacy.net/privacy-policy">
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          </a>
+        </td>
+        <td>Non-Profit</td>
+        <td><a data-toggle="tooltip" data-placement="bottom" data-original-title='"We do NOT log your IP address or DNS queries during normal operations. We do NOT share query data with third parties that are not directly involved with resolving the query (i.e. sending queries to authoritative nameservers for resolution)."' href="https://appliedprivacy.net/privacy-policy/">Some</a></td>
+        <td>DoH, DoT</td>
+        <td>Yes</td>
+        <td>Yes</td>
+        <td>No</td>
+        <td>?</td>
+      </tr>
+
+      <tr>
+        <td data-value="nextdns">
+          <a href="https://www.nextdns.io/">nextdns</a>
+        </td>
+        <td>Anycast (based in <span class="flag-icon flag-icon-us"></span> US)</td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.nextdns.io/privacy" href="https://www.nextdns.io/privacy">
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          </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>DoH, DoT, DNSCrypt</td>
+        <td>Yes</td>
+        <td>Yes</td>
+        <td>Based on user choice</td>
+        <td>?</td>
+      </tr>
+
+      <tr>
+        <td data-value="PowerDNS">
+          <a href="https://powerdns.org/">PowerDNS</a>
+        </td>
+        <td><span class="flag-icon flag-icon-nl"></span> The Netherlands</td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://powerdns.org/doh/privacy.html" href="https://powerdns.org/doh/privacy.html">
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          </a>
+        </td>
+        <td>Hobby Project</td>
+        <td>No</td>
+        <td>DoH</td>
+        <td>Yes</td>
+        <td>No</td>
+        <td>No</td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://github.com/PowerDNS/pdns" href="https://github.com/PowerDNS/pdns">
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          </a>
+        </td>
+      </tr>
+
+      <tr>
+        <td data-value="Quad9">
+          <a href="https://quad9.net/">Quad9</a> <span class="badge badge-warning" data-toggle="tooltip" title="Founders include the Global Cyber Alliance, comprised of the City of London Police and Manhattan District Attorney's Office"><i class="fas fa-exclamation-triangle"></i></span>
+        </td>
+        <td>Anycast (based in <span class="flag-icon flag-icon-us"></span> US)</td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://quad9.net/policy/" href="https://quad9.net/policy/">
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          </a>
+        </td>
+        <td>Non-Profit</td>
+        <td><a data-toggle="tooltip" data-placement="bottom" data-original-title='"Our normal course of data management does not have any IP address information or other PII logged to disk or transmitted out of the location in which the query was received."' href="https://quad9.net/policy/">Some</a></td>
+        <td>DoH, DoT, DNSCrypt</td>
+        <td>Yes</td>
+        <td>Yes</td>
+        <td>Malicious domains</td>
+        <td>?</td>
+      </tr>
+
+      <tr>
+        <td data-value="SecureDNS">
+          <a href="https://securedns.eu/">SecureDNS</a>
+        </td>
+        <td><span class="flag-icon flag-icon-nl"></span> The Netherlands</td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://securedns.eu/#privacy" href="https://securedns.eu/#privacy">
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          </a>
+        </td>
+        <td>Hobby Project</td>
+        <td>No</td>
+        <td>DoH, DoT, DNSCrypt</td>
+        <td>Yes</td>
+        <td>Yes</td>
+        <td>Based on server choice</td>
+        <td>?</td>
+      </tr>
+
+      <tr>
+        <td data-value="UncensoredDNS">
+          <a href="https://blog.uncensoreddns.org/">UncensoredDNS</a>
+        </td>
+        <td>Anycast (based in <span class="flag-icon flag-icon-dk"></span> Denmark)</td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title='"Absolutely nothing is being logged, neither about the users nor the usage of this service. I do keep graphs of the total number of queries, but no personally identifiable information is saved. The data that is saved will never be sold or used for anything except capacity planning of the service."'>
+            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          </a>
+        </td>
+        <td>Hobby Project</td>
+        <td>No</td>
+        <td data-value="doh">DoT</td> <!-- "hack" to group "DoT" values (when sorted) with "DoH" values -->
+        <td>Yes</td>
+        <td>No</td>
+        <td>No</td>
+        <td>?</td>
+      </tr>
+    </tbody>
+  </table>
+
+  <h4>Terms</h4>
+
+  <ul>
+    <li>DNS-over-TLS (DoT) - A security protocol for encrypted DNS on a dedicated port 853.</li>
+    <li>DNS-over-HTTPS (DoH) - Similar to DoT, but uses HTTPS instead, being indistinguishable from "normal" HTTPS traffic on port 443.</li>
+    <li>DNSCrypt - An older yet robust method of encrypting DNS.</li>
+  </ul>
+
+  <h3>Worth Mentioning and Additional Information</h3>
+
+  <ul>
+    <li>Firefox comes with built-in DoH support with Cloudflare set as the default resolver, but can be configured to use any DoH resolver. <span class="badge badge-warning" data-toggle="tooltip" data-placement="bottom" data-original-title='"Cloudflare has agreed to collect only a limited amount of data about the DNS requests that are sent to the Cloudflare Resolver for Firefox via the Firefox browser."'><a href="https://developers.cloudflare.com/1.1.1.1/commitment-to-privacy/privacy-policy/firefox/"><i class="fas fa-exclamation-triangle"></i></a></span> Currently Mozilla is <a href="https://blog.mozilla.org/futurereleases/2019/07/31/dns-over-https-doh-update-detecting-managed-networks-and-user-choice/">conducting studies</a> before enabling DoH by default for all US-based Firefox users.</li>
+    <li>Android 9 comes with a DoT client by <a href="https://support.google.com/android/answer/9089903">default</a>. <span class="badge badge-warning" data-toggle="tooltip" data-original-title="...but with some caveats"><a href="https://www.quad9.net/private-dns-quad9-android9/"><i class="fas fa-exclamation-triangle"></i></a></span></li>
+    <li>
+      <a href="https://apps.apple.com/app/id1452162351">DNSCloak</a> - An <a href="https://github.com/s-s/dnscloak">open-source</a> DNSCrypt and DoH client for iOS by <td><a data-toggle="tooltip" data-placement="bottom" data-original-title='"A charitable non-profit host organization for international Free Software projects."' href="https://techcultivation.org/">the Center for the Cultivation of Technology gemeinnuetzige GmbH</a>.
+    </li>
+    <li>
+      <a href="https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Daemon+-+Stubby">Stubby</a> - An <a href="https://github.com/getdnsapi/stubby">open-source</a> application for Linux, macOS, and Windows that acts as a local DNS Privacy stub resolver using DoT.
+    </li>
+    <li><a href="https://www.isc.org/blogs/qname-minimization-and-privacy/">QNAME Minimization and Your Privacy</a> by the Internet Systems Consortium (ISC)</li>
+    <li><a href="https://www.isc.org/dnssec/">DNSSEC and BIND 9</a> by the ISC</li>
+  </ul>
+</div>

_includes/sections/email-providers.html

@@ -153,6 +153,22 @@
         <td data-value="1"><span class="label label-success">Yes</span></td>
       </tr>
 
+      <tr>
+        <td data-value="Soverin">
+          <img alt="Soverin" src="/assets/img/provider/Soverin.png" width="200" height="70">
+        </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://soverin.net/" href="https://soverin.net/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2015">2015</td>
+        <td><span class="flag-icon flag-icon-nl"></span> Netherlands</td>
+        <td data-value="25000">25 GB</td>
+        <td data-value="35">29 €</td>
+        <td data-value="0"><span class="label label-success">No</span></td>
+        <td data-value="1"><span class="label label-success">No</span></td>
+        <td data-value="1"><span class="label label-success">Yes</span></td>
+      </tr>
+
       <tr>
         <td data-value="StartMail">
           <img alt="StartMail" src="/assets/img/provider/StartMail.png" width="200" height="70">

_includes/sections/paste-services.html

@@ -7,4 +7,14 @@ description="PrivateBin is a minimalist, open source online pastebin where the s
 website="https://bin.privacytools.io/"
 forum="https://forum.privacytools.io/t/discussion-privatebin/296"
 github="https://github.com/PrivateBin/PrivateBin"
-%}
+%}
+
+
+{% include cardv2.html
+title="CryptPad"
+image="/assets/img/provider/CryptPad.png"
+description="CryptPad is an open source, zero knowledge, realtime collaborative editor. Data is encrypted/decrypted in the browser using 256bit AES."
+website="https://cryptpad.fr/pad/"
+forum="https://forum.privacytools.io/t/discussion-cryptpad/1270"
+github="https://github.com/xwiki-labs/cryptpad"
+%}

_includes/sections/self-contained-networks.html

@@ -7,11 +7,11 @@
 <div class="row mb-2">
 
   {% include card.html color="success"
-  title="Tor Browser"
+  title="Tor"
   image="/assets/img/tools/Tor-Project.png"
   url="https://www.torproject.org/"
   tor="http://expyuzz4wqqyqhjn.onion"
-  footer='OS: Windows, macOS, Linux, <a href="https://mike.tig.as/onionbrowser/">iOS</a>, <a href="https://www.torproject.org/docs/android.html.en">Android</a>, <a href="https://github.com/torbsd/openbsd-ports">OpenBSD.</a>'
+  footer='OS: Windows, macOS, Linux, <a href="https://mike.tig.as/onionbrowser/">iOS</a>, Android (<a href="https://www.torproject.org/download/#android">Tor Browser</a>, <a href="https://guardianproject.info/apps/orbot/">Proxy other apps with Orbot</a>), <a href="https://github.com/torbsd/openbsd-ports">OpenBSD.</a>'
   description="The Tor network is a group of volunteer-operated servers that allows people to improve their privacy and security on the Internet. Tor's users employ this network by connecting through a series of virtual tunnels rather than making a direct connection, thus allowing both organizations and individuals to share information over public networks without compromising their privacy. Tor is an effective censorship circumvention tool."
   %}
 

_includes/sections/social-news-aggregator.html

@@ -0,0 +1,57 @@
+<h1 id="obb" class="anchor"><a href="#social-news-aggregator"><i class="fas fa-link anchor-icon"></i></a> Social News Aggregators</h1>
+
+<div class="alert alert-warning" role="alert">
+  <strong>If you are currently using a online bulletin board like Reddit, you should pick an alternative here.</strong>
+</div>
+
+{% include cardv2.html
+title="Aether"
+image="/assets/img/tools/aether.png"
+description='<a href="https://github.com/nehbit/aether/blob/master/LICENSE.md">Free/libre and open source</a> decentralized social news aggregator with a built in voting system.'
+website="https://github.com/nehbit/aether"
+forum="https://forum.privacytools.io/t/discussion-aether/1256"
+github="https://github.com/nehbit/aether"
+windows=""
+mac=""
+linux=""
+android=""
+ios=""
+bsd=""
+%}
+
+{% include cardv2.html
+title="Tildes"
+image="/assets/img/tools/tildes.png"
+description='Tildes is a web-based self-hostable online bulletin board. It is licensed under <a href="https://gitlab.com/tildes/tildes/blob/master/LICENSE">GPL 3.0</a>.'
+website="https://tildes.net"
+forum="https://forum.privacytools.io/t/discussion-tildes/1257"
+git="https://gitlab.com/tildes/"
+windows=""
+mac=""
+linux=""
+android=""
+ios=""
+bsd=""
+%}
+
+{% include cardv2.html
+title="Raddle"
+image="/assets/img/tools/raddle.png"
+description="Raddle is a public Postmill instance focused on privacy and anti-censorship."
+website="https://raddle.me"
+forum="https://forum.privacytools.io/t/discussion-raddle/1258"
+git="https://gitlab.com/postmill/"
+windows=""
+mac=""
+linux=""
+android=""
+ios=""
+%}
+
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li><a href="https://beta.akasha.world/">Akasha</a> - A decentralized online bulletin board using <a href="https://www.wikipedia.org/wiki/InterPlanetary_File_System">IPFS</a> and <a href="https://www.wikipedia.org/wiki/Ethereum">Ethereum</a>.</li>
+  <li><a href="https://dev.lemmy.ml/">Lemmy</a> - An <a href="https://github.com/dessalines/lemmy/blob/master/LICENSE">AGPL</a> licensed self-hostable link aggregator intended to work in the <a href="https://www.wikipedia.org/wiki/Fediverse">Fediverse</a>.</li>
+  <li><a href="https://notabug.io/">notabug.io</a> - notabug.io is a <a href="https://github.com/notabugio/notabug/blob/master/LICENSE.md">free and open source</a> p2p link aggregator with a strong resemblance to old.reddit.com (not to be confused with <a href="https://notabug.org/">NotABug.org</a>).</li>
+</ul>

_includes/sections/teamchat.html

@@ -0,0 +1,41 @@
+<h1 id="teamchat" class="anchor"><a href="#teamchat"><i class="fas fa-link anchor-icon"></i></a> Team chat applications where everything is end-to-end encrypted or under the control of your team administrator</h1>
+
+<div class="alert alert-warning" role="alert">
+        <strong>If your project currently uses a team chat like <a href="https://web.archive.org/web/20171029114027/https://feedback.discordapp.com/forums/326712-discord-dream-land/suggestions/17094256-implement-whispersystems-encryption-for-voice-and">Discord</a> or <a href="https://drewdevault.com/2015/11/01/Please-stop-using-slack.html">Slack</a> you should pick an alternative here.</strong>
+</div>
+
+{% include cardv2.html
+title="Rocket.chat"
+image="/assets/img/tools/rocket.chat.png"
+description="Rocket.chat is an self-hostable open source platform for team communication. It has optional federation and experimental E2EE. <a href=\"https://rocket.chat/docs/user-guides/end-to-end-encryption/\"><span class=\"badge badge-warning\" data-toggle=\"tooltip\" title=\"The documentation says this of E2EE: 'Note: This feature is currently in alpha. It's also not yet supported on mobile'. There is no forward secrecy so compromised decryption password would leak all messages. The federation was also added afterwards potentially causing room for mistakes.'\">Experimental <i class=\"far fa-question-circle\"></i></a></span>"
+website="https://rocket.chat/"
+forum="https://forum.privacytools.io/t/discussion-rocket-chat/1223"
+github="https://github.com/rocketchat/"
+android=""
+ios=""
+mac=""
+windows=""
+linux=""
+%}
+
+{% include cardv2.html
+title="Keybase"
+image="/assets/img/tools/keybase.png"
+description='Keybase provides a hosted team chat with end-to-end encryption. It has also been <a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">indepedently audited (PDF)</a>. <span class="badge badge-warning" data-toggle="tooltip" title="The server side of Keybase runs on proprietary code and is centralized">experimental <i class="far fa-question-circle"></i> (<a href="https://github.com/keybase/client/issues/6374">GitHub issue</a>)</span>'
+website="https://keybase.io/"
+forum="https://forum.privacytools.io/t/discussion-keybase/1224"
+github="https://github.com/Keybase"
+android=""
+ios=""
+mac=""
+windows=""
+linux=""
+web=""
+%}
+
+
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li><a href="https://wire.com/en/products/pro-secure-team-collaboration/">Wire Pro</a> - Paid team communication with E2EE. <span class="badge badge-warning" data-toggle="tooltip" title="The Privacytools.io team has no experience with Wire Pro, while we can recommend the free version.">Untested<i class="far fa-question-circle"></i></span></li>
+</ul>

_includes/sections/vpn.html

@@ -64,22 +64,6 @@
         <td><span class="flag-icon flag-icon-hk"></span> Hong Kong</td>
       </tr>
 
-      <tr>
-        <td data-value="cryptostorm">
-          <a href="https://cryptostorm.is/"><img alt="Cryptostorm" src="/assets/img/provider/Cryptostorm.png" width="200" height="70"></a>
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://cryptostorm.is/" href="https://cryptostorm.is/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="http://stormwayszuh4juycoy4kwoww5gvcu2c4tdtpkup667pdwe4qenzwayd.onion. Requires specific software to access: torproject.org" href="http://stormwayszuh4juycoy4kwoww5gvcu2c4tdtpkup667pdwe4qenzwayd.onion/"><img alt="Tor" src="/assets/img/layout/tor.png" width="35"></a>
-        </td>
-        <td data-value="2006">2006</td>
-        <td data-value="52">$ 52</td>
-        <td><span class="label label-success">Yes</span></td>
-        <td>28</td>
-        <td><span class="label label-success">Yes</span></td>
-        <td><span class="flag-icon flag-icon-is"></span> Iceland</td>
-      </tr>
-
       <tr>
         <td data-value="ExpressVPN">
           <a href="https://www.expressvpn.com/"><img alt="ExpressVPN" src="/assets/img/provider/ExpressVPN.png" width="200" height="70"></a>

assets/css/style.scss

@@ -182,4 +182,4 @@ footer {
   i {
     margin-right: 1rem;
   }
-}
+}

donate.html

@@ -88,7 +88,21 @@ permalink: /donate/
 <div class="col-md-12 col-lg-8 offset-lg-2 text-right">
 
       <div class="form-group row">
-        <label for="BAT" class="col-sm-4 col-form-label"><strong>Brave BAT</strong></label>
+        <label for="BNB" class="col-sm-4 col-form-label"><strong>Binance Coin (BNB)</strong></label>
+        <div class="col-sm-8">
+          <input id="BNB" type="text" value="bnb17zlv4xnkjsujks80cclx46uhm9h8txms82htwj" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+        </div>
+      </div>
+
+      <div class="form-group row">
+        <label for="EOS" class="col-sm-4 col-form-label"><strong>EOS</strong></label>
+        <div class="col-sm-8">
+          <input id="EOS" type="text" value="privacytools" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
+        </div>
+      </div>
+
+      <div class="form-group row">
+        <label for="BAT" class="col-sm-4 col-form-label"><strong>Brave (BAT)</strong></label>
         <div class="col-sm-8">
           <input id="BAT" type="text" value="0x13DA8c6176a9bd171B8285067Ae38420B39eC11E" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
         </div>

pages/old.html

@@ -61,6 +61,8 @@ permalink: /classic/
 
 {% include sections/social-networks.html %}
 
+{% include sections/social-news-aggregator.html %}
+
 {% include sections/dns.html %}
 
 {% include sections/notebooks.html %}

pages/providers/social-news-aggregator.html

@@ -0,0 +1,8 @@
+---
+layout: page
+permalink: /providers/social-news-aggregator/
+title: "Social News Aggregator"
+description: "Stay up-to-date with privacy-respecting online bulletin boards."
+---
+
+{% include sections/social-news-aggregator.html %}

pages/software/teamchat.html

@@ -0,0 +1,8 @@
+---
+layout: page
+permalink: /software/teamchat/
+title: "Team chat"
+description: "Discover secure and private ways to communicate with your team online without letting any third parties read your messages."
+---
+
+{% include sections/teamchat.html %}

source_code.md

@@ -136,6 +136,12 @@ Backend: closed-source
 
  Ricochet: https://github.com/ricochet-im/ricochet
 
+## Team chat
+
+ Rocket.chat: https://github.com/rocketchat/
+ 
+ Keybase: https://github.com/Keybase
+
 ## Encrypted Video & Voice Messenger
  Signal: https://github.com/signalapp
 
@@ -257,22 +263,57 @@ Backend: closed-source
 
    GNU Social: https://gnu.io/source/
 
-## Domain Name System (DNS)
- Njalla: Non-free/Proprietary Software
+## Social News Aggregators
+
+Aether: https://github.com/nehbit/aether
+
+Tildes: https://gitlab.com/tildes
+
+Raddle: https://gitlab.com/postmill
+
+### Worth Mentioning
+
+- Akasha: https://github.com/AkashaProject
+
+- Lemmy: https://github.com/dessalines/lemmy
+
+- notabug.io: https://github.com/notabugio/notabug
+
+## Domain Name System (DNS)
+
+Njalla: Non-free/Proprietary Software
+
+DNSCrypt: https://github.com/dnscrypt
 
- DNSCrypt: https://github.com/dnscrypt
 DNSCrypt-proxy: https://github.com/jedisct1/dnscrypt-proxy/
 
- OpenNic: https://github.com/opennic/ (mostly)
+OpenNic: https://github.com/opennic/ (mostly)
+
 Webpage: https://github.com/opennic/opennic-web
 
-  Worth Mentioning
+### Worth Mentioning
 
-   NoTrack: https://github.com/quidsup/notrack
+- NoTrack: https://github.com/quidsup/notrack
 
-   Namecoin: https://github.com/namecoin
+- Namecoin: https://github.com/namecoin
 
-   Pi-hole: https://github.com/pi-hole
+- Pi-hole: https://github.com/pi-hole
+
+## Encrypted ICANN DNS Providers
+
+AdGuard DNS: https://github.com/AdguardTeam/AdGuardDNS/
+
+BlahDNS: https://github.com/ookangzheng/blahdns/
+
+CloudFlare DNS: https://github.com/cloudflare/dns
+
+PowerDNS: https://github.com/PowerDNS/pdns
+
+### Worth Mentioning and Additional Information
+
+- DNSCloak: https://github.com/s-s/dnscloak
+
+- Stubby: https://github.com/getdnsapi/stubby
 
 ## Digital Notebook
  Joplin: https://github.com/laurent22/joplin
@@ -293,6 +334,8 @@ Webpage: https://github.com/opennic/opennic-web
  ZeroBin: https://github.com/sebsauvage/ZeroBin
 
  Ghostbin: https://github.com/kilgarth/ghostbin
+ 
+ CryptPad: https://github.com/xwiki-labs/cryptpad
 
   Worth Mentioning:
 
@@ -385,9 +428,8 @@ Backend: Closed Source
      MicroG: https://github.com/microg
 
 ## Android Privacy Add-ons
-   NetGuard: https://github.com/M66B/NetGuard/
 
-   XPrivacyLua: https://github.com/M66B/XPrivacyLua/
+NetGuard: https://github.com/M66B/NetGuard/
 
 ## Open Source Router Firmware
    OpenWRT: https://git.openwrt.org/?p=openwrt/openwrt.git;a=shortlog;h=refs/tags/v18.06.1