Merge remote-tracking branch 'upstream/master'

.github/CONTRIBUTING.md

@@ -13,14 +13,49 @@ Please read this before contributing.
 We're trying to keep it simple and promote the best tools, not all of them.
 
 ## Software Criteria
-
+### Main
 - Easy to use. Could your mother use that tool or service? Usability is most important.
 - Cross-platform / Accessible.
 - Privacy respecting.
 - Open Source / free software is preferred but not required.
+- Must list source code in [source_code.md](https://github.com/privacytoolsIO/privacytools.io/blob/master/source_code.md) (if applicable)
+- Prioritize Products without Vendor Lock-in (decentralized/self-hostable) or data interoperability.
 
 There can be exceptions if no software is available that meet the criteria.
 
+Note: This criteria applies to all of privacytools.io
+### Proividers
+- Prioritize Products by privacy respecting nationality.
+
+### VPN
+- Prioritize Products by privacy respecting nationality.
+- Cannot be based in USA or UK.
+- Must be acessable via free software (i.e OpenVPN, WireGuard)
+- Use Encryption
+- Accept Cryptocurrency
+- No logging policy
+
+### Email
+- Outside of USA
+- Support SMTP SSL
+- Accessable Using Free Software (i.e IMAP)
+
+### Hardware
+- Must be [H-Node Class A](https://h-node.org/wiki/page/en/compatibility-classes) or Equivlant (if applicable)
+- Must prioritize hardware certifications like [RYF](https://ryf.fsf.org/), [OSHWA](https://certification.oshwa.org/), and OSI when avalible.
+- Cannot lock users to a particular platform.
+
+### Software
+- Must be able to download over encrypted network (can be a mirror)
+- Must be free software
+
+### Encryption
+- Only verifiable encryption is to be trusted
+
+### OSes
+- Must state if recommends, depends on, or offers non-free software (contrib)
+- No Tracking Policy (opt-in analytics is ok)
+
 ## Images
 
 - Provider logos are 200px x 70px ([example](https://www.privacytools.io/assets/img/provider/AirVPN.png))

.github/FUNDING.yml

@@ -1,2 +1,3 @@
+liberapay: privacytools.io
 patreon: privacytools
 custom: https://www.privacytools.io/donate/

.github/ISSUE_TEMPLATE/3_Discussion.md

@@ -1,3 +1,8 @@
+<!--
+    Is there already a discussion about this on the forum (https://forum.privacytools.io/search)?
+    If not, please open a new discussion there. Thank you!
+-->
+
 ---
 name: "💬 Discussion"
 about: Discuss the website or any mentioned software in general.

.github/ISSUE_TEMPLATE/6_Translation_Issues.md

@@ -0,0 +1,21 @@
+---
+name: "🇦🇶 Translation Issue"
+about: Report any issue with a translated site.
+title: "🇦🇶 Translated Site Issue | "
+labels: 🌐 website issue, 🇦🇶 translations
+---
+
+## Site Affected
+
+**Domain:**
+
+<!-- Add an x to the box below if true [x] -->
+- [ ] This site is listed as a translated version of the site in the privacytools.io navbar.
+
+## Description
+
+<!--
+## Screenshots
+
+Please add screenshots if applicable
+-->

.well-known/matrix/client

@@ -3,6 +3,6 @@
         "base_url": "https://chat.privacytools.io"
     },
     "m.identity_server": {
-        "base_url": "https://vector.im"
+        "base_url": "https://chat.privacytools.io"
     }
 }

.well-known/security.txt

@@ -2,3 +2,4 @@ Contact: admin@privacytools.io
 Encryption: https://www.jonaharagon.com/keys/
 Preferred-Languages: en
 Canonical: https://www.privacytools.io/.well-known/security.txt
+Policy: https://github.com/privacytoolsIO/privacytools.io/security/policy

README.md

@@ -1,4 +1,4 @@
-[![privacytools](https://privacytools.io/assets/img/layout/logo.png)](https://www.privacytools.io/)
+[![privacytools](./assets/img/layout/logo.png)](https://www.privacytools.io/)
 
 _Encryption Against Global Mass Surveillance._
 
@@ -31,6 +31,7 @@ You can submit your suggestions here on GitHub [(Issues)](https://github.com/pri
 # Community Translations
 - [繁体中文 / Chinese](https://privacytools.twngo.xyz/) - [GitHub](https://github.com/twngo/privacytools-zh)
 - [Español / Spanish](https://victorhck.gitlab.io/privacytools-es/) - [GitLab](https://gitlab.com/victorhck/privacytools-es)
+- [Polski / Polish](https://pl.privacytools.io) - [Gitea](https://git.privacytools.io/pl-privacytoolsIO/pl.privacytools.io)
 - [Deutsch / German](https://privacytools.it-sec.rocks/) - [GitHub](https://github.com/Anon215/privacytools.it-sec.rocks)
 - [Français / French](https://privacytools.dreads-unlock.fr/) - [GitLab](https://gitlab.com/Booteille/privacytools)
 - [Italiano / Italian](https://privacytools-it.github.io/) - [GitHub](https://github.com/privacytools-it/privacytools-it.github.io)

SECURITY.md

@@ -0,0 +1,35 @@
+# Security Policies and Procedures
+
+This document outlines security procedures and policies for the `privacytools.io` repository/code and all services hosted by privacytools.io, such as Mastodon, Matrix, Riot, et cetera.
+
+## Reporting a Bug
+
+We take all security bugs related to our code and our infrastructure very seriously. Thank you for improving the security of our projects and services. We appreciate your efforts and responsible disclosure, and will make every effort to acknowledge your contributions.
+
+Report any security bugs by emailing the services administrator at [admin@privacytools.io](mailto:admin@privacytools.io).
+
+The administrative team will acknowledge your message within 48 hours, and will provide a detailed response within 72 hours detailing the next steps for handling your report. After our initial reply we will make every effort to keep you informed of the progress towards a fix and announcement, and we may ask for additional information or guidance.
+
+Please report any security bugs in third-party projects to the person or team maintaining that project.
+
+The following are out of scope and should **not** be attacked/performed:
+
+* Excessive Automated Scans
+* Denial of Service Attacks
+* Social Engineering Attacks
+* Reports against infrastructure outside our control
+* User or admin accounts not owned by the tester
+
+## Disclosure Policy
+
+When we receive a security report, that report will be assigned to an administrative team member. That person will coordinate the fix, release, and announcement process, involving the following steps:
+
+1. Confirm the problem and determine affected services.
+2. Audit infrastructure and/or code to find any potential similar problems.
+3. Prepare fixes for all releases currently in production, which will be implemented as quickly as possible.
+
+Additionally, if user data was directly affected or compromised, we will inform affected users to the best of our ability via email and/or a website notification with more information about the incident.
+
+## Comments on this Policy
+
+Please open a Pull Request or Issue if you would like to discuss any changes to this policy.

_includes/card.html

@@ -56,7 +56,7 @@
                 {% if include.tor %}
                 <a class="mb-1" data-toggle="tooltip" data-placement="bottom" data-original-title="{{include.tor}} 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 %}
-                
+
                 {% if include.git %}
                 <a class="mb-1" data-toggle="tooltip" data-placement="bottom" data-original-title="{{include.git}} supports source code compiling and open review | is free software" href="{{include.git}}"><img alt="Git" src="assets/img/layout/git.png" width="35"></a>
                 {% endif %}

_includes/cardv2.html

@@ -7,42 +7,47 @@
       <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>
+    <div class="d-flex justify-content-between flex-column flex-md-row align-items-start align-items-md-center">
-    {% if include.forum %}
+      <div class="flex-shrink-0 mr-2">
-    <a href="{{include.forum}}" class="btn btn-success"><i class="fab fa-discourse fa-fw"></i> Forum</a>
+        <a href="{{include.website}}" class="btn btn-primary mt-1"><i class="fas fa-external-link-alt fa-fw"></i> Website</a>
-    {% endif %}
+        {% if include.forum %}
-    {% if include.tor %}
+        <a href="{{include.forum}}" class="btn btn-success mt-1"><i class="fab fa-discourse fa-fw"></i> Forum</a>
-    <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 %}
-    {% 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">
+      <div class="mt-2">
-        {% if include.windows %}<i class="fab fa-windows fa-2x fa-fw"></i>{% endif %}
+          {% 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"></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"></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"></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.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"></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"></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"></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"></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.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"></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"></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.icon1}}
-        {{include.icon2}}
+          {{include.icon2}}
-        {{include.icon3}}
+          {{include.icon3}}
 
-        {% if include.github %}<a href="{{include.github}}"><i class="fab fa-github 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"></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"></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>
 </div>
-<br>
+<br>

_includes/footer.html

@@ -7,36 +7,36 @@
   <div class="row mb-4">
     <div class="col-12 col-md-6 d-flex justify-content-between">
       <a href="mailto:?subject=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&body=https://www.privacytools.io/" class="share-btn email" title="Email">
-        <i class="fas fa-envelope"></i>
+        <i class="fas fa-envelope pl-3"></i>
       </a>
 
       <a href="https://www.facebook.com/sharer/sharer.php?u=https://www.privacytools.io" class="share-btn facebook" title="Facebook">
-        <i class="fab fa-facebook-f"></i>
+        <i class="fab fa-facebook-f pl-3"></i>
       </a>
 
       <a href="https://twitter.com/share?text=Knowledge%20and%20tools%20to%20protect%20your%20privacy%20against%20global%20mass%20surveillance%20&amp;url=https://www.privacytools.io/&amp;via=privacytoolsIO" class="share-btn twitter" title="Twitter">
-        <i class="fab fa-twitter"></i>
+        <i class="fab fa-twitter pl-3"></i>
       </a>
 
       <a href="https://sharetomastodon.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url=https://www.privacytools.io" class="share-btn mastodon" title="Mastodon">
-        <i class="fab fa-mastodon"></i>
+        <i class="fab fa-mastodon pl-3"></i>
       </a>
     </div>
     <div class="col-12 col-md-6 d-flex justify-content-between">
       <a href="https://reddit.com/submit?url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn reddit" title="reddit">
-        <i class="fab fa-reddit-alien"></i>
+        <i class="fab fa-reddit-alien pl-3"></i>
       </a>
 
       <a href="https://www.linkedin.com/shareArticle?url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn linkedin" title="LinkedIn">
-        <i class="fab fa-linkedin-in"></i>
+        <i class="fab fa-linkedin-in pl-3"></i>
       </a>
 
       <a href="http://www.stumbleupon.com/submit?url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn stumbleupon" title="StumbleUpon">
-        <i class="fab fa-stumbleupon"></i>
+        <i class="fab fa-stumbleupon pl-3"></i>
       </a>
 
       <a href="https://sharetodiaspora.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url=https://www.privacytools.io" class="share-btn diaspora" title="Diaspora*">
-        <i class="fas fa-asterisk"></i>
+        <i class="fas fa-asterisk pl-3"></i>
       </a>
     </div>
   </div>
@@ -72,7 +72,7 @@
 
   <div class="copyright-text">
     <p><strong>No Ads, No Google Analytics, No Affiliates, No Cross-Site Requests.</strong> <em>privacytools.io is a socially motivated website that provides information for protecting your data security and privacy. Never trust any company with your privacy, always encrypt.</em> <a href="/privacy-policy/">View our privacy policy</a>.</p>
-    <p>Tor v3: <strong>privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd.onion</strong> (<a href="https://write.privacytools.io/jonah/tor-on-privacytools-io">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">Learn More</a>)</p>
   </div>
 
 </footer>

_includes/nav.html

@@ -16,9 +16,12 @@
           <div class="dropdown-menu" aria-labelledby="providerDropdown">
             <a class="dropdown-item" href="/providers/#ukusa"><i class="fab fa-creative-commons-nc fa-fw"></i> Avoid US & UK services</a>
             <a class="dropdown-item" href="/providers/cloud-storage/"><i class="fas fa-cloud fa-fw"></i> Cloud Storage</a>
+            <a class="dropdown-item" href="/providers/social-networks/"><i class="fas fa-expand-arrows-alt fa-fw"></i> Social Networks</a>
+            <a class="dropdown-item" href="/providers/social-news-aggregator/"><i class="far fa-newspaper fa-fw"></i> Social News Aggregators</a>
             <a class="dropdown-item" href="/providers/dns/"><i class="fa fa-tasks fa-fw"></i> DNS</a>
             <a class="dropdown-item" href="/providers/email/"><i class="fas fa-mail-bulk fa-fw"></i> Email</a>
             <a class="dropdown-item" href="/providers/hosting/"><i class="fas fa-database fa-fw"></i> Hosting</a>
+            <a class="dropdown-item" href="/providers/paste/"><i class="fas fa-paste fa-fw"></i> Pastebins</a>
             <a class="dropdown-item" href="/providers/search-engines/"><i class="fab fa-searchengin fa-fw"></i> Search Engines</a>
             <a class="dropdown-item" href="/providers/social-networks/"><i class="fas fa-expand-arrows-alt fa-fw"></i> Social Networks</a>
             <a class="dropdown-item" href="/providers/vpn/"><i class="far fa-eye-slash fa-fw"></i> VPN</a>
@@ -41,6 +44,7 @@
             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> Calendar/Contacts Sync Tools</a>
             <a class="dropdown-item" href="/software/notebooks/"><i class="far fa-sticky-note fa-fw"></i> Digital Notebook</a>
             <a class="dropdown-item" href="/software/email/#messaging"><i class="fas fa-random fa-fw"></i> Email Alternatives</a>
             <a class="dropdown-item" href="/software/email/"><i class="fas fa-envelope fa-fw"></i> Email Clients</a>
@@ -80,6 +84,7 @@
           <div class="dropdown-menu" aria-labelledby="servicesDropdown">
             <a href="https://privacytools.twngo.xyz/" class="dropdown-item">繁體中文</a>
             <a href="https://victorhck.gitlab.io/privacytools-es/" class="dropdown-item">Español</a>
+            <a href="https://pl.privacytools.io/" class="dropdown-item">Polski</a>
             <a href="https://www.privacidade.digital/" class="dropdown-item">Português</a>
             <a href="https://privacytools.it-sec.rocks/" class="dropdown-item">Deutsch</a>
             <a href="https://privacytools-it.github.io/" class="dropdown-item">Italiano</a>

_includes/sections/browser-addons.html

@@ -8,8 +8,7 @@
 {% include cardv2.html
 title="Privacy Badger: Stop Tracking"
 image="/assets/img/addons/privacy-badger.png"
-description="<strong>Privacy Badger</strong> is a browser add-on that stops advertisers and other third-party trackers from secretly tracking where you go and what pages you look at on the web. Privacy Badger learns about trackers as you browse. <span class=\"badge badge-warning\" data-toggle=\"tooltip\" title=\"Please be aware that Google Analytics is considered first-party by Privacy Badger, which means that Google Analytics will not be blocked if you do not use another blocker, such as uBlock Origin.
+description="<strong>Privacy Badger</strong> is a browser add-on that stops advertisers and other third-party trackers from secretly tracking where you go and what pages you look at on the web. Privacy Badger learns about trackers as you browse."
-\">warning <i class=\"far fa-question-circle\"></i></span>"
 website="https://www.eff.org/privacybadger"
 forum="https://forum.privacytools.io/t/discussion-privacy-badger/265"
 github="https://github.com/EFForg/privacybadger"
@@ -83,6 +82,18 @@ opera=""
 safari=""
 %}
 
+{% include cardv2.html
+title="Snowflake"
+image="/assets/img/addons/snowflake.png"
+description="<strong>Snowflake</strong> is a new <a href=https://2019.www.torproject.org/docs/pluggable-transports.html.en>pluggable transport</a> from the Tor Project. If you have an uncensored connection, running this extension volunteers your connection to be used as a Snowflake proxy to help users unable to connect to the Tor network. Your IP will not be visible to the sites users visit using your proxy, as this extension will not make you an exit node. If your access to the Tor network is blocked, this extension will not assist you, and you should use the <a href=https://www.torproject.org>Tor Browser</a> instead."
+website="https://snowflake.torproject.org"
+forum="https://forum.privacytools.io/t/discussion-snowflake/1146"
+github="https://gitweb.torproject.org/pluggable-transports/snowflake.git"
+firefox=""
+chrome=""
+%}
+
+
 <h2>For Experts Only</h2>
 
 <div class="alert alert-warning" role="alert">
@@ -110,4 +121,4 @@ forum="https://forum.privacytools.io/t/discussion-noscript-security-suite/272"
 github="https://github.com/hackademix/noscript"
 firefox=""
 chrome=""
-%}
+%}

_includes/sections/browser-tweaks.html

@@ -20,10 +20,10 @@
   <dd>A result of the <a href="https://wiki.mozilla.org/Security/Tor_Uplift">Tor Uplift</a> effort, this preference makes Firefox more resistant to browser fingerprinting.</dd>
 
   <dt>privacy.trackingprotection.fingerprinting.enabled = true</dt>
-  <dd>Blocks Fingerprinting</dd>  
+  <dd>[FF67+] Blocks Fingerprinting</dd>
 
   <dt>privacy.trackingprotection.cryptomining.enabled = true</dt>
-  <dd>Blocks CryptoMining</dd>  
+  <dd>[FF67+] Blocks CryptoMining</dd>
 
   <dt>privacy.trackingprotection.enabled = true</dt>
   <dd>This is Mozilla's new built-in tracking protection. It uses Disconnect.me filter list, which is redundant if you are already using uBlock Origin 3rd party filters, therefore you should set it to false if you are using the add-on functionalities.</dd>

_includes/sections/dns.html

@@ -33,4 +33,10 @@ 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>

_includes/sections/email-clients.html

@@ -3,10 +3,10 @@
 {% include cardv2.html
 title="Thunderbird"
 image="/assets/img/tools/Thunderbird.png"
-description="Mozilla Thunderbird is a free, open source, cross-platform email, news, and chat client developed by the Mozilla Foundation. Thunderbird is an email, newsgroup, news feed, and chat (XMPP, IRC, Twitter) client."
+description="Thunderbird is a free, open source, cross-platform email, newsgroup, news feed, and chat (XMPP, IRC, Twitter) client developed by community, previously by the Mozilla Foundation."
-website="https://mozilla.org/thunderbird"
+website="https://www.thunderbird.net/"
 forum="https://forum.privacytools.io/t/discussion-thunderbird/659"
-github="https://github.com/mozilla"
+source="https://hg.mozilla.org/comm-central/"
 windows=""
 mac=""
 linux=""
@@ -16,7 +16,7 @@ bsd=""
 {% include cardv2.html
 title="Claws Mail"
 image="/assets/img/tools/Claws-Mail.png"
-description="Claws Mail is a free and open source, GTK+-based email and news client. It offers easy configuration and an abundance of features. It is included with Gpg4win, an encryption suite for Windows."
+description="Claws Mail is a free and open source, GTK-based email and news client. It offers easy configuration and an abundance of features. It is included with Gpg4win, an encryption suite for Windows."
 website="https://www.claws-mail.org/"
 forum="https://forum.privacytools.io/t/discussion-claws-mail/660"
 git="https://git.claws-mail.org/"
@@ -33,8 +33,8 @@ bsd=""
   <li><a href="https://www.gpg4usb.org/">gpg4usb</a> - A very easy to use and small portable editor to encrypt and decrypt any text-message or -file. For Windows and Linux. <a href="https://theprivacyguide.org/tutorials/gpg.html">GPG tutorial</a>.</li>
   <li><a href="https://www.mailvelope.com/">Mailvelope</a> - A browser extension that enables the exchange of encrypted emails following the <a href="https://theprivacyguide.org/tutorials/pgp.html">OpenPGP encryption standard</a>.</li>
   <li><a href="https://www.enigmail.net/">Enigmail</a> - A security extension to Thunderbird and Seamonkey. It enables you to write and receive email messages signed and/or encrypted with the <a href="https://theprivacyguide.org/tutorials/pgp.html">OpenPGP standard</a>.</li>
-  <li><a href="https://addons.mozilla.org/thunderbird/addon/torbirdy/">TorBirdy</a> - TorBirdy configures Thunderbird to make connections over the Tor anonymity network. This extension is in beta and should be considered experimental.</li>
+  <li><a href="https://addons.thunderbird.net/thunderbird/addon/torbirdy/">TorBirdy</a> - TorBirdy configures Thunderbird to make connections over the Tor anonymity network. This extension is in beta and should be considered experimental.</li>
-  <li><a href="https://emailprivacytester.com/">Email Privacy Tester</a> - This tool will send an Email to your address and perform privacy-related tests.</li>
+  <li><a href="https://www.emailprivacytester.com/">Email Privacy Tester</a> - This tool will send an Email to your address and perform privacy-related tests.</li>
 </ul>
 
 <h3>Worth Mentioning</h3>

_includes/sections/email-providers.html

@@ -8,12 +8,12 @@
   <table class="table sortable-theme-bootstrap" data-sortable>
     <thead>
       <tr>
-        <th data-sortable="true">Email Service</th>
+        <th data-sorted="true" data-sorted-direction="descending">Email Provider</th>
-        <th data-sortable="true">URL</th>
+        <th data-sortable="false">Website</th>
         <th data-sortable="true">Since</th>
-        <th data-sortable="true">Server</th>
+        <th data-sortable="true">Jurisdiction</th>
         <th data-sortable="true">Storage</th>
-        <th data-sortable="true">Price / Year</th>
+        <th data-sortable="true">Yearly Price</th>
         <th data-sortable="true">Bitcoin</th>
         <th data-sortable="true">Encryption</th>
         <th data-sortable="true">Own Domain</th>
@@ -27,7 +27,7 @@
           <img alt="Protonmail" src="/assets/img/provider/ProtonMail.ch.png" width="200" height="70">
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.protonmail.ch" href="https://www.protonmail.ch"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://protonmail.com" href="https://protonmail.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
           <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://protonirockerxow.onion. Requires specific software to access: torproject.org" href="https://protonirockerxow.onion"><img alt="Tor" src="/assets/img/layout/tor.png" width="35"></a>
         </td>
         <td data-value="2013">2013</td>
@@ -76,7 +76,7 @@
           <img alt="Mailfence" src="/assets/img/provider/Mailfence.png" width="200" height="70">
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.mailfence.com" href="https://www.mailfence.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailfence.com" href="https://mailfence.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
         </td>
         <td data-value="2013">2013</td>
         <td><span class="flag-icon flag-icon-be"></span> Belgium</td>
@@ -93,7 +93,7 @@
 
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.mailbox.org" href="https://www.mailbox.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35 "height="35"></a>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailbox.org" href="https://mailbox.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35 "height="35"></a>
         </td>
         <td data-value="2014">2014</td>
         <td><span class="flag-icon flag-icon-de"></span> Germany</td>
@@ -109,7 +109,7 @@
           <img alt="Posteo" src="/assets/img/provider/Posteo.png" width="200" height="70">
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.posteo.de" href="https://www.posteo.de"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://posteo.de" href="https://posteo.de"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
         </td>
         <td data-value="2009">2009</td>
         <td><span class="flag-icon flag-icon-de"></span> Germany</td>
@@ -132,7 +132,7 @@
         <td><span class="flag-icon flag-icon-no"></span> Norway</td>
         <td data-value="1000">1 GB</td>
         <td data-value="20">$ 19.95</td>
-        <td data-value="1"><span class="label label-primary">Yes</span></td>
+        <td data-value="1"><span class="label label-primary">Accepted</span></td>
         <td data-value="0"><span class="label label-primary">No</span></td>
         <td data-value="1"><span class="label label-success">Yes</span></td>
       </tr>
@@ -174,7 +174,7 @@
           <img alt="Kolab Now" src="/assets/img/provider/Kolab-Now.png" width="200" height="70">
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.kolabnow.com" href="https://www.kolabnow.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://kolabnow.com" href="https://kolabnow.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
         </td>
         <td data-value="2010">2010</td>
         <td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>

_includes/sections/file-sharing.html

@@ -40,4 +40,4 @@ linux=""
 
 <ul>
   <li><a href="https://github.com/schollz/croc">croc</a> - Easily and securely send things from one computer to another.</li>
-</ul>  
+</ul>

_includes/sections/instant-messenger.html

@@ -1,16 +1,16 @@
 <h1 id="im" class="anchor"><a href="#im"><i class="fas fa-link anchor-icon"></i></a> Encrypted Instant Messenger</h1>
 
 <div class="alert alert-warning" role="alert">
-  <strong>If you are currently using an Instant Messenger like WhatsApp, Viber, LINE, Telegram or Threema, you should pick an alternative here.</strong>
+  <strong>If you are currently using an Instant Messenger like LINE, Telegram, Viber, <a href="https://www.eff.org/deeplinks/2016/10/where-whatsapp-went-wrong-effs-four-biggest-security-concerns">WhatsApp</a>, or plain SMS messages you should pick an alternative here.</strong>
 </div>
 
 
 {% include cardv2.html
-title="Mobile: Signal"
+title="Signal"
 image="/assets/img/tools/Signal.png"
 description="Signal is a mobile app developed by Open Whisper Systems. The app provides instant messaging, as well as voice and video calling.
 All communications are end-to-end encrypted. Signal is free and open source."
-website="https://signal.org"
+website="https://signal.org/"
 forum="https://forum.privacytools.io/t/discussion-signal/664"
 github="https://github.com/signalapp"
 android=""
@@ -21,27 +21,11 @@ linux=""
 %}
 
 
-{% include cardv2.html
-title="Riot.im"
-image="/assets/img/tools/Riot.png"
-description="Riot.im is a decentralized free-software chatting application based on the <a href\"https://matrix.org/\">Matrix</a> protocol, a recent open protocol for real-time communication offering E2E encryption. It can bridge other communications via others protocols such as IRC too. <span class=\"badge badge-warning\" data-toggle=\"tooltip\" title=\"The software is currently in beta and the mobile client states 'End-to-end encryption is in beta and may not be reliable. You should not yet trust it to secure data.'\">beta <i class=\"far fa-question-circle\"></i></span>"
-website="https://riot.im/"
-forum="https://forum.privacytools.io/t/discussion-riot-im/665"
-github="https://github.com/vector-im"
-android=""
-ios=""
-mac=""
-windows=""
-linux=""
-web=""
-%}
-
-
 {% include cardv2.html
 title="Wire"
 image="/assets/img/tools/wire.png"
-description='A free software End-to-End Encrypted chatting application that supports instant messaging, voice, and video calls. Full source code is available. <span class="badge badge-warning" data-toggle="tooltip" title="Wire stores metadata such as list of your connections/conversations in plaintext (= not encrypted).">experimental <i class="far fa-question-circle"></i> (<a href="https://www.vice.com/en_us/article/gvzw5x/secure-messaging-app-wire-stores-everyone-youve-ever-contacted-in-plain-text">more info</a>)</span>'
+description='A free software End-to-End Encrypted chatting application that supports instant messaging, voice, and video calls. Full source code is available. <span class="badge badge-warning" data-toggle="tooltip" title="Wire stores metadata such as list of your connections/conversations in plaintext (= not encrypted)."><a href="https://www.vice.com/en_us/article/gvzw5x/secure-messaging-app-wire-stores-everyone-youve-ever-contacted-in-plain-text">Warning</a></span>'
-website="https://get.wire.com/"
+website="https://wire.com/"
 forum="https://forum.privacytools.io/t/discussion-wire/750"
 github="https://github.com/wireapp/"
 android=""
@@ -63,17 +47,19 @@ web=""
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://ricochet.im/">Ricochet</a> - Ricochet uses the <a href="/browsers/#browser"><i class="fas fa-link"></i> Tor network</a> 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. <span class="badge badge-warning" data-toggle="tooltip" title="This software is an experiment."><a href="https://github.com/ricochet-im/ricochet#experimental">Experimental</a></span> <span class="badge badge-danger">Danger</span> <a href="#ricochetTor">Keep Tor up to date</a></li>
+  <li><a href="https://briarproject.org/">Briar</a> - An ultra-secure peer-to-peer instant messenger that connects to contacts via Direct Wi-Fi, Bluetooth, or Tor over the internet, keeping its users protected from surveillance and censorship.
   <li><a href="https://retroshare.cc/">RetroShare</a> - An E2E encrypted instant messaging and voice/video call client. RetroShare supports both TOR and I2P. </li>
-  <li>XMPP federated clients with OMEMO support:</li>
+  <li><a href="https://xmpp.org/">XMPP</a> - Federated instant messaging protocol with <a href="https://conversations.im/omemo/">OMEMO</a>, OTR, or OpenPGP end-to-end encryption:</li>
   <ul>
-    <li><a href="https://monal.im/">Monal</a> (iOS, MacOS) - An XMPP client in active development.</li>
+    <li><a href="https://conversations.im/">Conversations</a> (Android) - An open source Jabber/XMPP client for Android 4.4+ smartphones. <span class="badge badge-success">OMEMO</span></li>
-    <li><a href="https://conversations.im/">Conversations</a> (Android) - An open source Jabber/XMPP client for Android 4.4+ smartphones. Supports end-to-end encryption with either OMEMO or OpenPGP.</li>
+    <li><a href="https://gajim.org/">Gajim</a> (FreeBSD, Linux, Windows) - An open source fully featured XMPP client. <span class="badge badge-success">OMEMO</span></li>
-    <li><a href="https://gajim.org/">Gajim</a> (Linux) - An open source fully featured XMPP client.</li>
+    <li><a href="https://monal.im/">Monal</a> (iOS, MacOS) - An XMPP client in active development. <span class="badge badge-success">OMEMO</span></li>
-    <li><a href="https://omemo.top">List of OMEMO ready clients</a></li>
+    <li><a href="https://omemo.top/">Other OMEMO ready clients</a>.</li>
   </ul>
-  <li><a href="https://kontalk.org/">Kontalk</a> - A community-driven instant messaging network. Supports end-to-end encryption. Both client-to-server and server-to-server channels are fully encrypted.</li>
+  <li><a href="https://www.kontalk.org/">Kontalk</a> - A community-driven instant messaging network. Supports end-to-end encryption. Both client-to-server and server-to-server channels are fully encrypted.</li>
-  <li><a href="https://status.im/">Status</a> - <span class="badge badge-warning">Experimental</span> A free and open-source, peer-to-peer, encrypted instant messanger with support for DAPPs. </li>
+  <li><a href="https://keybase.io/">Keybase</a> - <span class="badge badge-warning" data-toggle="tooltip" title="This software relies on a closed-source central server.">Warning</span> End-to-end encrypted messaging with social verification.</li>
+  <li><a href="https://status.im/">Status</a> - <span class="badge badge-warning">Experimental</span> A free and open-source, peer-to-peer, encrypted instant messanger with support for DAPPs.</li>
+  <li><a href="https://ricochet.im/">Ricochet</a> - <span class="badge badge-danger" data-toggle="tooltip" title="This software is safe if you manually keep Tor up to date."><a href="#ricochetTor" class="text-white">Danger</a></span> <span class="badge badge-warning" data-toggle="tooltip" title="This software is considered safe but experimental and the client has not been updated since 2016."><a href="https://github.com/ricochet-im/ricochet#experimental">Experimental</a></span> Ricochet uses the <a href="/browsers/#browser"><i class="fas fa-link"></i> Tor network</a> 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.</li>
 </ul>
 
 

_includes/sections/key-disclosure-law.html

@@ -48,7 +48,7 @@
     <li><a href="https://iclg.com/practice-areas/cybersecurity-laws-and-regulations/italy">Italy</a> <div class="float-right"><span class="flag-icon flag-icon-it"></span></div></li>
     <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Poland">Poland</a> <div class="float-right"><span class="flag-icon flag-icon-pl"></span></div></li>
     <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Sweden">Sweden</a> (proposed) <div class="float-right"><span class="flag-icon flag-icon-se"></span></div></li>
-    <li><a href="https://www.wikipedia.org/wiki/Key_disclosure_law#Switzerland">Switzerland</a> <div class="float-right"><span class="flag-icon flag-icon-ch"></span></div></li>    
+    <li><a href="https://www.wikipedia.org/wiki/Key_disclosure_law#Switzerland">Switzerland</a> <div class="float-right"><span class="flag-icon flag-icon-ch"></span></div></li>
   </ol>
   '
   %}

_includes/sections/notebooks.html

@@ -9,9 +9,9 @@
   {% include card.html color="success"
   title="Joplin"
   image="/assets/img/tools/Joplin.png"
-  url="https://joplin.cozic.net/"
+  url="https://joplinapp.org/"
   footer="OS: Windows, macOS, Linux, iOS, Android, Firefox/Chrome (Web Clipper)."
-  description="Joplin is a free, open source, fully featured note taking and to-do application, which can handle a large number of markdown notes organized into notebooks and tags. It offers E2EE encryption and can sync through Nextcloud, Dropbox and more. It also offers easy import from Evernote and plain text notes."
+  description="Joplin is a free, open source, fully featured note taking and to-do application, which can handle a large number of markdown notes organized into notebooks and tags. It offers E2E encryption and can sync through Nextcloud, Dropbox and more. It also offers easy import from Evernote and plain text notes."
   %}
 
   {% include card.html color="primary"
@@ -42,6 +42,6 @@
 
 <ul>
   <li><a href="https://github.com/notable/notable">Notable</a> - The markdown-based note-taking app that doesn't suck.</li>
-  <li><a href="http://paperwork.rocks/">Paperwork</a> - Open source and self-hosted solution. For PHP / MySQL servers.</li>
+  <li><a href="https://paperwork.cloud/">Paperwork</a> - Open source and self-hosted solution. For PHP / MySQL servers.</li>
   <li><a href="https://orgmode.org">Org-mode</a> - A major mode for GNU Emacs. Org-mode is for keeping notes, maintaining TODO lists, planning projects, and authoring documents with a fast and effective plain-text system. </li>
 </ul>

_includes/sections/operating-systems.html

@@ -46,6 +46,4 @@
     completely open source version of Arch Linux.</li>
   <li><a href="https://www.whonix.org/">Whonix</a> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A Debian GNU/Linux based security-focused Linux distribution. It aims to provide privacy, security and anonymity on the internet. The operating system consists of two virtual machines, a "Workstation"
     and a Tor "Gateway". All communication are forced through the Tor network to accomplish this.</li>
-  <li><a href="https://subgraph.com/">Subgraph OS</a> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - Another Debian based Linux distribution, it features security hardening which makes it more resistant to security vulnerabilities. Subgraph runs many desktop applications in a security sandbox to limit their risk in case of compromise.
-    By default, it anonymizes Internet traffic by sending it through the Tor network. Note: It is still in alpha, and much testing and bug fixing still has to be done.</li>
 </ul>

_includes/sections/router-firmware.html

@@ -14,7 +14,7 @@
   title="pfSense"
   labels="warning:contrib:This software may depend on or recommend non-free software."
   image="/assets/img/tools/pfSense.png"
-  url="https://pfsense.org/"
+  url="https://www.pfsense.org/"
   description="pfSense is an open source firewall/router computer software distribution based on FreeBSD. It is installed on a computer to make a dedicated firewall/router for a network and is noted for its reliability and offering features often only found in expensive commercial firewalls. pfSense is commonly deployed as a perimeter firewall, router, wireless access point, DHCP server, DNS server, and as a VPN endpoint."
   %}
 

_includes/sections/search-engines.html

@@ -54,7 +54,8 @@ github="https://github.com/Qwant/"
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://yacy.net/">YaCy</a> - A free software P2P search engine powered by its users.</a></li>  
+  <li><a href="https://yacy.net/">YaCy</a> - A free software P2P search engine powered by its users.</a></li>
-  <li><a href="https://jivesearch.com/">Jive Search</a> - A free software search engine with a similar look and feel to Google.</a></li>  
+  <li><a href="https://jivesearch.com/">Jive Search</a> - A free software search engine with a similar look and feel to Google.</a></li>
   <li><a href="https://metager.de/en/">MetaGer</a> - An open source metasearch engine, which is based in Germany. It focuses on protecting the user's privacy.</li>
+  <li><a href="https://www.mojeek.com/">Mojeek</a> - Independent and unbiased search results with no user tracking.</li>
 </ul>

_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."
   %}
 
@@ -40,7 +40,7 @@
 
 <ul>
   <li><a href="https://darknetdiaries.com/">darknetdiaries.com</a> - True stories from the dark side of the Internet.</li>
-</ul>  
+</ul>
 
 <h3>Worth Mentioning</h3>
 
@@ -49,4 +49,5 @@
   <li><a href="https://retroshare.cc/">RetroShare</a> - Open Source cross-platform, Friend-2-Friend and secure decentralized communication platform.</li>
   <li><a href="https://gnunet.org/">GNUnet</a> - GNUnet provides a strong foundation of free software for a global, distributed network that provides security and privacy.</li>
   <li><a href="https://ipfs.io/">IPFS</a> - A peer-to-peer hypermedia protocol to make the web faster, safer, and more open. (<a href="https://github.com/privacytoolsIO/privacytools.io/pull/361#issuecomment-344414022">important privacy warning</a>)</li>
+  <li><a href="https://yggdrasil-network.github.io/">Yggdrasil</a> - An early-stage implementation of a fully end-to-end encrypted IPv6 network. It is lightweight, self-arranging, supported on multiple platforms and allows pretty much any IPv6-capable application to communicate securely with other Yggdrasil nodes. Yggdrasil does not require you to have IPv6 Internet connectivity - it also works over IPv4. <span class="badge badge-warning" data-toggle="tooltip" title="The project is currently in early stages but it is being actively developed.">experimental <i class=\"far fa-question-circle\"></i></span> <span class="badge badge-danger" data-toggle="tooltip" title="Yggdrasil doesn't have a goal of providing anonymity and your peers know your IP address unless you are only using Tor/I2P peers.">privacy warning <i class="far fa-question-circle"></i></span></li>
 </ul>

_includes/sections/selfhosted-cloud.html

@@ -38,4 +38,3 @@
 <ul>
   <li><a href="https://github.com/xwiki-labs/cryptpad/">CryptPad</a> - End-to-end encrypted real time collaboration sharing folders, media, and documents (open-source).</li>
 </ul>
-

_includes/sections/social-networks.html

@@ -82,5 +82,5 @@ web=""
   <li><a href="https://www.facebook.com/help/delete_account">Delete your Facebook account</a> - Direct link to delete your Facebook account without being able to reactivate it again.</li>
   <li><a href="https://deletefacebook.com/">How To Permanently Delete A Facebook Account</a> - This guide will take you through a smooth and successful Facebook account deletion.</li>
   <li><a href="https://addons.mozilla.org/firefox/addon/facebook-container/">Facebook Container by Mozilla</a> - Prevent Facebook from tracking you around the web.</li>
-  <li><a href="https://www.stopusingfacebook.co/">Stop using Facebook</a> - A curated list of reasons to stop using Facebook and how to do it.</li>  
+  <li><a href="https://www.stopusingfacebook.co/">Stop using Facebook</a> - A curated list of reasons to stop using Facebook and how to do it.</li>
-</ul>	
+</ul>

_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/vpn.html

@@ -9,226 +9,284 @@
   <table class="table sortable-theme-bootstrap" data-sortable>
     <thead>
       <tr>
-        <th data-sortable="true">Sortable VPN Providers Table</th>
+        <th data-sorted="true" data-sorted-direction="descending">VPN Provider</th>
+        <th data-sortable="false">Website</th>
+        <th data-sortable="true">Since</th>
         <th data-sortable="true">Yearly Price</th>
         <th data-sortable="true">Free Trial</th>
         <th data-sortable="true" title="Number of Servers"># Servers</th>
         <th data-sortable="true">WireGuard</th>
         <th data-sortable="true">Jurisdiction</th>
-        <th data-sortable="false">Website</th>
       </tr>
     </thead>
     <tbody>
       <tr>
         <td data-value="AirVPN">
           <a href="https://airvpn.org/"><img alt="AirVPN" src="/assets/img/provider/AirVPN.png" width="200" height="70"></a></td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://airvpn.org/" href="https://airvpn.org/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2010">2010</td>
         <td data-value="{{ 54 | times: eur_to_usd }}">54 €</td>
         <td><span class="label label-success">Yes</span></td>
         <td>162</td>
         <td><span class="label label-warning">No</span></td>
         <td><span class="flag-icon flag-icon-it"></span> Italy</td>
-        <td><a href="https://airvpn.org/">AirVPN.org</a></td>
       </tr>
 
       <tr>
         <td data-value="AzireVPN">
           <a href="https://www.azirevpn.com/"><img alt="AzireVPN" src="/assets/img/provider/AzireVPN.png" width="200" height="70"></a>
         </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.azirevpn.com/" href="https://www.azirevpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2012">2012</td>
         <td data-value="{{ 45 | times: eur_to_usd }}">45 €</td>
         <td><span class="label label-success">Yes</span></td>
         <td>22</td>
         <td><span class="label label-success">Yes</span></td>
         <td><span class="flag-icon flag-icon-se"></span> Sweden</td>
-        <td><a href="https://www.azirevpn.com/">AzireVPN.com</a></td>
       </tr>
 
       <tr>
         <td data-value="blackVPN">
           <a href="https://www.blackvpn.com/"><img alt="blackVPN" src="/assets/img/provider/blackVPN.png" width="200" height="70"></a>
         </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.blackvpn.com/" href="https://www.blackvpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2009">2009</td>
         <td data-value="{{ 49 | times: eur_to_usd }}">49 €</td>
         <td><span class="label label-success">Yes</span></td>
         <td>31</td>
         <td><span class="label label-warning">No</span></td>
         <td><span class="flag-icon flag-icon-hk"></span> Hong Kong</td>
-        <td><a href="https://www.blackvpn.com/">blackVPN.com</a></td>
       </tr>
 
       <tr>
-        <td data-value="Cryptostorm">
+        <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>
-        <td><a href="https://cryptostorm.is/">Cryptostorm.is</a></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>
         </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.expressvpn.com/" href="https://www.expressvpn.com/"><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://expressobutiolem.onion. Requires specific software to access: torproject.org" href="http://expressobutiolem.onion/"><img alt="Tor" src="/assets/img/layout/tor.png" width="35"></a>
+        </td>
+        <td data-value="2009">2009</td>
         <td data-value="100">$ 99.95</td> <!-- USD on December 28, 2018 -->
         <td><span class="label label-success">Yes</span></td>
         <td>148</td>
         <td><span class="label label-warning">No</span></td>
         <td><span class="flag-icon flag-icon-vg"></span> British Virgin Islands</td>
-        <td><a href="https://www.expressvpn.com/">ExpressVPN.com</a></td>
       </tr>
 
       <tr>
         <td data-value="FrootVPN">
           <a href="https://www.frootvpn.com/"><img alt="FrootVPN" src="/assets/img/provider/FrootVPN.png" width="200" height="70"></a>
         </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.frootvpn.com/" href="https://www.frootvpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2014">2014</td>
         <td data-value="36">$ 35.88</td>
         <td><span class="label label-warning">No</span></td>
         <td>27</td>
         <td><span class="label label-warning">No</span></td>
         <td><span class="flag-icon flag-icon-se"></span> Sweden</td>
-        <td><a href="https://www.frootvpn.com/">FrootVPN.com</a></td>
       </tr>
 
       <tr>
         <td data-value="hide.me">
           <a href="https://hide.me/"><img alt="hide.me" src="/assets/img/provider/hide.me.png" width="200" height="70"></a>
         </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://hide.me/" href="https://hide.me/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2012">2012</td>
         <td data-value="0"><a data-toggle="tooltip" data-placement="bottom" data-original-title="2 GB data transfer, 1 simultaneous connection" href="https://hide.me/pricing">Free</a></td>
         <td><span class="label label-success">Yes</span></td>
         <td>160+</td>
         <td><span class="label label-warning">No</span></td>
         <td><span class="flag-icon flag-icon-my"></span> Malaysia</td>
-        <td><a href="https://hide.me/">hide.me</a></td>
       </tr>
 
       <tr>
         <td data-value="IVPN">
           <a href="https://www.ivpn.net/"><img alt="IVPN" src="/assets/img/provider/IVPN.png" width="200" height="70"></a>
         </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.ivpn.net/" href="https://www.ivpn.net/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2009">2009</td>
         <td data-value="100">$ 100</td>
         <td><span class="label label-success">Yes</span></td>
         <td>38</td>
         <td><span class="label label-success">Yes</span></td>
         <td><span class="flag-icon flag-icon-gi"></span> Gibraltar</td>
-        <td><a href="https://www.ivpn.net/">IVPN.net</a></td>
       </tr>
 
       <tr>
         <td data-value="Mullvad">
           <a href="https://mullvad.net/"><img alt="Mullvad" src="/assets/img/provider/Mullvad.png" width="200" height="70"></a>
         </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mullvad.net/" href="https://mullvad.net/"><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://xcln5hkbriyklr6n.onion. Requires specific software to access: torproject.org" href="http://xcln5hkbriyklr6n.onion/"><img alt="Tor" src="/assets/img/layout/tor.png" width="35"></a>
+        </td>
+        <td data-value="2009">2009</td>
         <td data-value="{{ 60 | times: eur_to_usd }}">60 €</td>
-        <td><span class="label label-success">Yes</span></td>
+        <td><span class="label label-success">No</span></td>
         <td>281</td>
         <td><span class="label label-success">Yes</span></td>
         <td><span class="flag-icon flag-icon-se"></span> Sweden</td>
-        <td><a href="https://mullvad.net/">Mullvad.net</a></td>
       </tr>
 
       <tr>
         <td data-value="NordVPN">
           <a href="https://nordvpn.com/"><img alt="NordVPN" src="/assets/img/provider/NordVPN.png" width="200" height="70"></a>
         </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://nordvpn.com/" href="https://nordvpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2012">2012</td>
         <td data-value="84">$ 83.88</td>
         <td><span class="label label-success">Yes</span></td>
         <td>5200+</td>
         <td><span class="label label-warning">No</span></td>
         <td><span class="flag-icon flag-icon-pa"></span> Panama</td>
-        <td><a href="https://nordvpn.com/">NordVPN.com</a></td>
       </tr>
 
       <tr>
-        <td data-value="OVPN.com">
+        <td data-value="OVPN">
           <a href="https://www.ovpn.com/"><img alt="OVPN" src="/assets/img/provider/ovpn.png" width="200" height="70"></a>
         </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.ovpn.com/" href="https://www.ovpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2014">2014</td>
         <td data-value="{{ 84 | times: eur_to_usd }}">84 €</td>
         <td><span class="label label-success">Yes</span></td>
         <td>67</td>
         <td><span class="label label-warning">No</span></td>
         <td><span class="flag-icon flag-icon-se"></span> Sweden</td>
-        <td><a href="https://www.ovpn.com/">OVPN.com</a></td>
       </tr>
 
       <tr>
         <td data-value="Perfect Privacy">
           <a href="https://www.perfect-privacy.com/"><img alt="Perfect Privacy" src="/assets/img/provider/Perfect-Privacy.png" width="200" height="70"></a>
         </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.perfect-privacy.com/" href="https://www.perfect-privacy.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2008">2008</td>
         <td data-value="{{ 119.99 | times: eur_to_usd }}">119.99 €</td>
         <td><span class="label label-warning">No</span></td>
         <td>54</td>
         <td><span class="label label-warning">No</span></td>
         <td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
-        <td><a href="https://www.perfect-privacy.com/">Perfect-Privacy.com</a></td>
       </tr>
 
       <tr>
         <td data-value="ProtonVPN">
           <a href="https://protonvpn.com/"><img alt="ProtonVPN" src="/assets/img/provider/ProtonVPN.png" width="200" height="70"></a     >
         </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://protonvpn.com/" href="https://protonvpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2016">2016</td>
         <td data-value="0"><a data-toggle="tooltip" data-placement="bottom" data-original-title="3 countries, 1 device, speed: low" href="https://protonvpn.com/pricing">Free</a></td>
         <td><span class="label label-success">Yes</span></td>
         <td>396</td>
         <td><span class="label label-warning">No</span></td>
         <td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
-        <td><a href="https://protonvpn.com/">ProtonVPN.com</a></td>
       </tr>
 
       <tr>
         <td data-value="Proxy.sh">
           <a href="https://proxy.sh/"><img alt="Proxy.sh" src="/assets/img/provider/Proxy.sh.png" width="200" height="70"></a>
         </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://proxy.sh/" href="https://proxy.sh/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2012">2012</td>
         <td data-value="40">$ 40</td>
         <td><span class="label label-warning">No</span></td>
         <td>300+</td>
         <td><span class="label label-warning">No</span></td>
         <td><span class="flag-icon flag-icon-sc"></span> Seychelles</td>
-        <td><a href="https://proxy.sh/">Proxy.sh</a></td>
       </tr>
 
       <tr>
         <td data-value="Trust.Zone">
           <a href="https://trust.zone/"><img alt="Trust.Zone" src="/assets/img/provider/Trust.Zone.png" width="200" height="70"></a>
         </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://trust.zone/" href="https://trust.zone/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2014">2014</td>
         <td data-value="40">$ 39.95</td>
         <td><span class="label label-success">Yes</span></td>
         <td>164</td>
         <td><span class="label label-warning">No</span></td>
         <td><span class="flag-icon flag-icon-sc"></span> Seychelles</td>
-        <td><a href="https://trust.zone/">Trust.Zone</a></td>
       </tr>
       <tr>
         <td data-value="VPN.ht">
           <a href="https://vpn.ht/"><img alt="VPN.ht" src="/assets/img/provider/VPN.ht.png" width="200" height="70"></a>
         </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://vpn.ht/" href="https://vpn.ht/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2014">2014</td>
         <td data-value="40">$ 39.99</td>
         <td><span class="label label-warning">No</span></td>
         <td>128</td>
         <td><span class="label label-warning">No</span></td>
         <td><span class="flag-icon flag-icon-hk"></span> Hong Kong</td>
-        <td><a href="https://vpn.ht/">VPN.ht</a></td>
       </tr>
       <tr>
         <td data-value="VPNArea">
           <a href="https://vpnarea.com/"><img alt="VPNArea" src="/assets/img/provider/vpnarea.png" width="200" height="70"></a>
         </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://vpnarea.com/" href="https://vpnarea.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2014">2014</td>
         <td data-value="59">$ 59</td>
         <td><span class="label label-success">Yes</span></td>
         <td>204</td>
         <td><span class="label label-warning">No</span></td>
         <td><span class="flag-icon flag-icon-bg"></span> Bulgaria</td>
-        <td><a href="https://vpnarea.com/">VPNArea.com</a></td>
       </tr>
       <tr>
         <td data-value="VPNTunnel">
           <a href="https://vpntunnel.com/"><img alt="VPNTunnel" src="/assets/img/provider/VPNTunnel.png" width="200" height="70"></a>
         </td>
+        <td>
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://vpntunnel.com/" href="https://vpntunnel.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+        </td>
+        <td data-value="2014">2014</td>
         <td data-value="{{ 35.88 | times: eur_to_usd }}">35.88 €</td>
         <td><span class="label label-warning">No</span></td>
         <td>800+</td>
         <td><span class="label label-warning">No</span></td>
         <td><span class="flag-icon flag-icon-sc"></span> Seychelles</td>
-        <td><a href="https://vpntunnel.com/">VPNTunnel.com</a></td>
       </tr>
 
     </tbody>
@@ -276,4 +334,4 @@
 
     </div>
   </div>
-</div>
+</div>

_includes/sections/windows10.html

@@ -91,9 +91,6 @@
       <ul>
         <li><a href="https://github.com/crazy-max/WindowsSpyBlocker/releases">WindowsSpyBlocker</a> - Open source tool that blocks data collection.</li>
         <li><a href="https://www.ghacks.net/2015/08/14/comparison-of-windows-10-privacy-tools/">Comparison of Windows 10 Privacy tools</a> - ghacks.net</li>
-        <li><a href="https://fix10.isleaked.com/">Fix Windows 10 privacy.</a> - fix10.isleaked.com</li>
-        <li><a href="https://arstechnica.com/information-technology/2015/08/windows-10-doesnt-offer-much-privacy-by-default-heres-how-to-fix-it/">Windows 10 doesn't offer much privacy by default: Here's how to fix it. </a> - Ars Technica.</li>
-        <li><a href="https://www.reddit.com/r/Windows10/comments/3f38ed/guide_how_to_disable_data_logging_in_w10">Guide: How to disable data logging in W10.</a></li>
       </ul>
     </div>
 

contact.md

@@ -15,7 +15,7 @@ It's very important to us to stay up-to-date on the latest changes in the privac
 
 [<i class="fab fa-reddit fa-lg fa-fw"></i> Suggest something new on reddit](https://www.reddit.com/r/privacytoolsIO/)
 
-For complete transparency, software and providers will only be considered for this website after discussions take place on either of the above platforms. 
+For complete transparency, software and providers will only be considered for this website after discussions take place on either of the above platforms.
 
 <span class="text-success"><i class="fas fa-comment"></i> New:</span> We're now on Matrix! Join us at `#general:privacytools.io` to chat with us and other members about this site and privacy in general. If you need a Matrix account, you can sign up with our own homeserver (`https://chat.privacytools.io`) using [riot.privacytools.io](https://riot.privacytools.io/) or any Matrix client! If you prefer XMPP, you're welcome to [use the Matrix.org XMPP bridge to join the discussion](https://conversations.im/j/%23general%23privacytools.io@bridge.xmpp.matrix.org).
 

donate.html

@@ -17,7 +17,7 @@ permalink: /donate/
       	<a class="btn btn-danger mb-1" href="https://www.patreon.com/privacytools"><i class="fab fa-patreon fa-lg fa-fw"></i> Patreon</a>
       	<a class="btn btn-primary mb-1" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=5G9CBU8P6F4K2"><i class="fab fa-paypal fa-lg fa-fw"></i> PayPal</a>
       </p>
-      
+
     </div>
   </div>
   <div class="row">
@@ -70,7 +70,7 @@ permalink: /donate/
         <div class="col-sm-8">
           <input id="XMR" type="text" value="45yJ8LkShLt2f9gCqbBQUcDw7um9XxD2vZ8h2Rt3GoLq9kMrznB3UAHBS1chJk9KjugpBbbJFGtdAeXE5j99wuGxDcbYUri" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
         </div>
-      </div>                              
+      </div>
 
     <div class="text-center">
       <p>We prefer Bitcoin donations to be above $5 due to the state of the network's transaction fees. You are welcome to donate any smaller or larger amount on any other cryptocurrency, such as Bitcoin Cash, Ethereum, or Stellar.</p>
@@ -78,7 +78,7 @@ permalink: /donate/
       <h2>More Cryptocurrencies</h2>
 
     </div>
-    
+
     </div>
   </div>
 
@@ -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>
@@ -106,7 +120,7 @@ permalink: /donate/
         <div class="col-sm-8">
           <input id="DOGE" type="text" value="DHHPUaDq562BzET6QxhudJepXNDoG7yP12" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
         </div>
-      </div>            
+      </div>
 
       <div class="form-group row">
         <label for="ETC" class="col-sm-4 col-form-label"><strong>Ethereum Classic (ETC)</strong></label>
@@ -239,7 +253,7 @@ permalink: /donate/
         <div class="col-sm-8">
           <input id="WAVES" type="text" value="3PES6AF194L56BuhRwrLF41eAsGzcGDARCi" onclick="this.focus();this.select()" class="form-control input-lg" readonly>
         </div>
-      </div>                  
+      </div>
 
       <div class="form-group row">
         <label for="XEM" class="col-sm-4 col-form-label"><strong>NEM (XEM)</strong></label>

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/providers/vpn.html

@@ -1,8 +1,63 @@
 ---
 layout: page
 permalink: /providers/vpn/
-title: "VPN Services for Privacy and Security"
+title: "VPN Services"
 description: "Find a no-logging VPN operator who isn't out to sell or read your web traffic."
 ---
 
+<div class="card border-danger">
+  <div class="card-header text-danger"><i class="fas fa-exclamation-circle fa-fw"></i> Warning</div>
+  <div class="card-body">
+    <p class="card-text text-danger">Using a VPN will <strong>not</strong> keep your browsing habits anonymous, nor will it add additional security to non-secure (HTTP) traffic.</p>
+    <p class="card-text text-danger">If you are looking for <strong>anonymity</strong>, you should use the Tor Browser <strong>instead</strong> of a VPN.</p>
+    <p class="card-text text-danger">If you're looking for added <strong>security</strong>, you should always ensure you're connecting to websites using HTTPS. A VPN is not a replacement for good security practices.</p>
+    <p class="card-text text-secondary">If you're looking for additional <strong>privacy</strong> from your ISP, on a public Wi-Fi network, or while torrenting files, a VPN may be the solution for you as long as you understand <a href="#info">the risks involved</a>.</p>
+    <a href="https://www.torproject.org/" class="btn btn-danger">Download Tor</a>
+    <a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-1-myth-busting-tor" class="btn btn-outline-danger">Tor Myths &amp; FAQ</a>
+    <a href="#info" class="btn btn-outline-secondary">More Info</a>
+  </div>
+</div>
+
 {% include sections/vpn.html %}
+
+<h1 id="info" class="anchor"><a href="#info"><i class="fas fa-link anchor-icon"></i></a> Further Information and Dangers</h1>
+
+<div class="container">
+  <div class="row">
+    <div class="col-md-6">
+      <h3>Should I use a VPN?</h3>
+      <p>The answer to this question is not a particularly helpful one: <strong>It depends.</strong> It depends on what you're expecting a VPN to do for you, who you're trying to hide your traffic from, and what applications you're using.</p>
+      <p><strong>In most cases, VPNs do little to protect your privacy or enhance your security</strong>, unless paired with other changes.</p>
+      <p>VPNs cannot encrypt data outside of the connection between your device and the VPN server. VPN providers can see and modify your traffic the same way your ISP could. And there is no way to verify a VPN provider's "no logging" policies in any way.</p>
+      <h3>What if I need encryption?</h3>
+      <p>In most cases, your traffic is already encrypted! Over 98% of the top 3000 websites offer <strong>HTTPS</strong>, meaning your traffic is safe regardless of using a VPN. It is incredibly rare for applications that handle personal data to not support HTTPS in 2019, especially with services like Let's Encrypt offering free HTTPS certificates to any website operator.</p>
+      <p>Even if a site you visit doesn't support HTTPS, a VPN will not protect you, because a VPN cannot magically encrypt the traffic between the VPN's servers and the website's servers. Installing an extension like <a href="https://www.eff.org/https-everywhere">HTTPS Everywhere</a> and making sure every site you visit uses HTTPS is far more helpful than using a VPN.</p>
+      <h3>What if I need anonymity?</h3>
+      <p>VPNs cannot provide strong anonymity. Your VPN provider will still see your real IP address, and often has a money trail that can be linked directly back to you. You cannot rely on "no logging" policies to protect your data.</p>
+    </div>
+    <div class="col-md-6">
+      <h3>Shouldn't I hide my IP address?</h3>
+      <p>The idea that your IP address is sensitive information, or that your location is given away with all your internet traffic is <strong>fearmongering</strong> on the part of VPN providers and their marketing. Your IP address is an insignificant amount of personal data tracking companies use to identify you, because many users' IP addresses change very frequently (Dynamic IP addresses, switching networks, switching devices, etc.). Your IP address also does not give away more than the very generalized location of your Internet Service Provider. It does not give away your home address, for example, despite common perception.</p>
+      <h3>Should I use Tor <em>and</em> a VPN?</h3>
+      <p>By using a VPN with Tor, you're creating essentially a permanent entry node, often with a money trail attached. This provides 0 additional benefit to you, while increasing the attack surface of your connection dramatically. If you wish to hide your Tor usage from your ISP or your government, Tor has a built-in solution for that: Tor bridges. <a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-2-onion-recipes-vpn-not-required">Read more about Tor bridges and why using a VPN is not necessary</a>.</p>
+      <h3>Are VPNs ever useful?</h3>
+      <p>A VPN may still be useful to you in a variety of scenarios, such as:</p>
+      <ol>
+        <li>Hiding your traffic from <strong>only</strong> your Internet Service Provider.</li>
+        <li>Hiding your downloads (such as Torrents) from your ISP and anti-piracy organizations.</li>
+      </ol>
+      <p>For use-cases like these, or if you have another compelling reason, the VPN providers we listed above are who we think are the most trustworthy. However, using a VPN provider still means you're <em>trusting</em> the provider. In pretty much any other scenario you should be using a secure<strong>-by-design</strong> tool such as Tor.</p>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col">
+      <p><strong>Sources and Further Reading</strong>:
+        <ol>
+          <li><a href="https://schub.io/blog/2019/04/08/very-precarious-narrative.html">VPN - a Very Precarious Narrative</a> by Dennis Schubert</li>
+          <li><a href="https://gist.github.com/joepie91/5a9909939e6ce7d09e29">Don't use VPN services</a> by Sven Slootweg</li>
+          <li><a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-1-myth-busting-tor">Slicing Onions: Part 1 – Myth-busting Tor</a> by blacklight447</li>
+          <li><a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-2-onion-recipes-vpn-not-required">Slicing Onions: Part 2 – Onion recipes; VPN not required</a> by blacklight447</li>
+        </ol>
+      <p>
+    </div>
+  </div>

source_code.md

@@ -10,156 +10,166 @@ https://github.com/privacytoolsIO/
 
 ## Browser Recommendation
  TorBrowser: https://gitweb.torproject.org/tor.git
- 
+
  Firefox: https://hg.mozilla.org/
- 
+
  Brave: https://github.com/brave/
 
 ## Excellent Firefox Privacy Add-ons
- 
+
  Privacy Badger: https://github.com/EFForg/privacybadger
- 
+
  uBlock Origin: https://github.com/gorhill/uBlock/
- 
+
  Cookie AutoDelete: https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/
- 
+
  HTTPS Everywhere: https://github.com/EFForg/https-everywhere
- 
+
  Decentraleyes: https://git.synz.io/Synzvato/decentraleyes
- 
+
+ Terms of Service; Didn’t Read : https://github.com/tosdr/
+
+ Snowflake : https://gitweb.torproject.org/pluggable-transports/snowflake.git
+
  uMatrix: https://github.com/gorhill/uMatrix/
- 
+
  NoScript: https://github.com/hackademix/noscript/
 
 ## Privacy-Conscious Email Providers
- 
+
  Posteo: https://github.com/posteo (backend & frontend)
  Note: Credit card payments may require non-free JS
- 
+
- ProtonMail: 
+ ProtonMail:
 Frontend: https://github.com/ProtonMail/WebClient
 Backend: closed-source
 
   Disroot: https://git.fosscommunity.in/disroot
  Related: https://board.disroot.org/project/disroot-disroot/issue/1138
  Website: https://git.fosscommunity.in/disroot/website + some other repositories https://git.fosscommunity.in/disroot/
- 
+
- Tutanota: 
+ Tutanota:
 Frontend: https://github.com/tutao/tutanota
 Backend: closed-source
- 
+
  Mailfence: Non-free/Proprietary Software
- 
+
  Mailbox.org: Non-free/Proprietary Software
- 
+
- runbox: 
+ runbox:
 Runbox 7: https://github.com/runbox/Runbox7
 Backend: closed-source
- 
+
  NEO MAILBOX: largely closed-source
- 
+
  Start Mail: largely closed-source
- 
+
  Kolab Now: ?
- 
+
- 
+
  Mail-in-a-Box: https://github.com/mail-in-a-box/mailinabox
 
    Interesting Email Providers Under Development
    Confidant Mail: List of components at https://www.confidantmail.org/docs/server_admin.html
-   
+
    Privacy Email Tools:
- 
+
  GPG4USB: https://github.com/gpg4usb/gpg4usb
- 
+
  Mailvelope: https://github.com/mailvelope/mailvelope
- 
+
  Enigmail: https://www.enigmail.net/index.php/en/download/source-code
- 
+
  TorBirdy: https://gitweb.torproject.org/torbirdy.git/
- 
+
  Email Privacy Tester: https://gitlab.com/mikecardwell/ept3
 
 ## Email Clients
  Thunderbird: https://github.com/thundernest/thunderbird-website
- 
+
  Claws Mail: https://git.claws-mail.org/
 
    Worth Mentioning:
- 
+
  K-9 Mail: https://github.com/k9mail/k-9/
- 
+
  GNU Privacy Guard: https://github.com/gpg/gnupg
- 
+
  Mailpile: https://github.com/mailpile/Mailpile
 
 ## Email Alternatives
  I2p Bote: https://github.com/i2p/i2p.i2p-bote
- 
+
  Bitmessage: https://github.com/Bitmessage
- 
+
  Retroshare: https://github.com/RetroShare
 
 ## Privacy Respecting Search Engines
  SearX: https://github.com/asciimoo/searx/
 
    Worth Mentioning:
- 
+
  MetaGer: https://gitlab.metager3.de/open-source/MetaGer
 
 ## Encrypted Instant Messenger
  Signal https://github.com/signalapp
- 
+
- Riot: https://github.com/vector-im
+ Wire: https://github.com/wireapp
- 
- Ricochet: https://github.com/ricochet-im/ricochet
 
    Worth Mentioning:
- 
+
- ChatSecure: https://github.com/chatsecure
+ Briar: https://code.briarproject.org/briar/briar/tree/master
- 
+
- Cryptocat: https://github.com/cryptocat/cryptocat
+ RetroShare: https://github.com/RetroShare/RetroShare
- 
+
- Kontalk: https://github.com/kontalk/
- 
  Conversations: https://github.com/siacs/Conversations
- 
+
- Wire: https://github.com/wireapp
+ Gajim: https://dev.gajim.org/gajim/gajim
+
+ Monal: https://github.com/anurodhp/Monal
+
+ Kontalk: https://github.com/kontalk
+
+ Keybase: https://github.com/keybase/client
+
+ Status.im: https://github.com/status-im
+
+ Ricochet: https://github.com/ricochet-im/ricochet
 
 ## Encrypted Video & Voice Messenger
  Signal: https://github.com/signalapp
- 
+
  Wire: https://github.com/wireapp
- 
+
  Linphone: https://github.com/BelledonneCommunications/
 
    Worth Mentioning
- 
+
  Jitsi: https://github.com/jitsi/jitsi-meet
 
  Tox: https://github.com/TokTok/c-toxcore
 
  Ring/Jami: https://gerrit-ring.savoirfairelinux.com/#/q/status:open
- 
+
  ## File Sharing
   OnionShare: https://github.com/micahflee/onionshare
-  
+
   Magic Wormhole: https://github.com/warner/magic-wormhole
-  
+
  ## Encrypted Cloud Storage Services
   Nextcloud: https://github.com/nextcloud
-  
+
   Least Authority S4: https://leastauthority.com/how-it-works/
-  
+
    Worth Mentioning
- 
+
  Cryptomator: https://github.com/cryptomator/cryptomator
- 
+
 ## Self-Hosted Cloud Server Software
  Pydio: https://github.com/pydio
- 
+
  Tahoe-LAFS: https://github.com/tahoe-lafs/tahoe-lafs
- 
+
  Nextcloud: https://github.com/nextcloud
 
 ## Secure Hosting Provider
@@ -169,144 +179,144 @@ Backend: closed-source
  SparkleShare: https://www.github.com/hbons/SparkleShare/
 
  Syncthing: https://github.com/syncthing/syncthing
- 
+
    Worth Mentioning
-.    
+.
     git-annex: http://source.git-annex.branchable.com/?p=source.git;a=summary
-    
+
 ## Password Manager Software
  Bitwarden: https://github.com/bitwarden
- 
+
  KeePass: https://keepass.info/download.html
- 
+
  KeePassXC: https://github.com/keepassxreboot
- 
+
  LessPass: https://github.com/lesspass/lesspass
- 
+
    Worth Mentioning
-.    
+.
     Master Password: https://gitlab.com/lhunath/MasterPassword
 .
     Password Safe: hhttps://sourceforge.net/p/passwordsafe/git-code/ci/master/tree/
-    
+
 ## Calendar and Contacts Sync
   Nextcloud: https://github.com/nextcloud
-  
+
   EteSync: https://github.com/etesync
-  
+
    Worth Mentioning:
-.    
+.
     fruux: https://fruux.com/opensource/
-.    
+.
     Flock: https://github.com/signalapp/Flock
-    
+
 ## File Encryption Software
  VeraCrypt: https://www.veracrypt.fr/en/Source%20Code.html
- 
+
  GNU Privacy Guard: https://github.com/gpg/gnupg
- 
+
  PeaZip: https://github.com/giorgiotani/PeaZip/
- 
+
  Cryptomator: https://github.com/cryptomator/cryptomator
- 
+
   Worth Mentioning:
-   
+
    miniLock: https://github.com/kaepora/miniLock
-   
+
    AES Crypt: https://github.com/marcobellaccini/pyAesCrypt
-   
+
    DiskCryptor: https://github.com/smartinm/diskcryptor
-   
+
    Linux Unified Key Setup (LUKS): https://gitlab.com/cryptsetup/cryptsetup/
-   
+
 ## Self-contained Networks
  TorBrowser: https://gitweb.torproject.org/tor.git
- 
+
  I2p: https://github.com/i2p
- 
+
  Freenet: https://github.com/freenet/
- 
+
   Worth Mentioining:
-   
+
    ZeroNet: https://github.com/HelloZeroNet/ZeroNet
-   
+
    RetroShare: https://github.com/RetroShare
-   
+
    GNUnet: https://gnunet.org/
-   
+
    IPFS: https://github.com/ipfs + https://github.com/ipfs-shipyard
-   
+
 ## Decentralized Social Networks
  Mastodon: https://github.com/tootsuite/mastodon
- 
+
  diaspora*: https://github.com/diaspora/diaspora/
- 
+
  Friendica: https://github.com/friendica/
- 
+
   Worth Mentioning:
-   
+
    GNU Social: https://gnu.io/source/
-   
+
 ## Domain Name System (DNS)
  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
- 
+
   Worth Mentioning
-   
+
    NoTrack: https://github.com/quidsup/notrack
-   
+
    Namecoin: https://github.com/namecoin
-   
+
    Pi-hole: https://github.com/pi-hole
-   
+
 ## Digital Notebook
  Joplin: https://github.com/laurent22/joplin
- 
+
  Standard Notes: https://github.com/standardnotes/
- 
+
  Turtl: https://github.com/turtl
- 
+
   Worth Mentioning
-   
+
    Paperwork: https://github.com/twostairs/paperwork
-   
+
    Org-mode: https://code.orgmode.org/bzg/org-mode
-   
+
 ## Paste Services
  PrivateBin: https://github.com/PrivateBin/PrivateBin/
- 
+
  ZeroBin: https://github.com/sebsauvage/ZeroBin
- 
+
  Ghostbin: https://github.com/kilgarth/ghostbin
- 
+
   Worth Mentioning:
-   
+
    Disroot: https://github.com/PrivateBin/PrivateBin via https://disroot.org/en/services/privatebin
   website: https://git.fosscommunity.in/disroot/website + some other repositories https://git.fosscommunity.in/disroot/
 
-   
+
 ## Productivity Tools
  Etherpad: https://github.com/ether/etherpad-lite
- 
+
  Write.as: https://code.as/writeas
- 
+
- Protected Text: 
+ Protected Text:
 Frontend:?
 Backend: closed-source
-  
+
   Worth Mentioning
-   
+
    Cryptee: https://github.com/cryptee
 Backend: Closed Source
-   
+
    EtherCalc: https://github.com/audreyt/ethercalc
-   
+
-   Disroot: 
+   Disroot:
   Email:
   Cloud: https://github.com/nextcloud/server
   Diaspora/Social-Network: https://github.com/diaspora/
@@ -314,84 +324,81 @@ Backend: Closed Source
   Chat: http://hg.prosody.im/
   Pads: https://github.com/ether/etherpad-lite
   Pastebin: https://github.com/PrivateBin/PrivateBin via https://disroot.org/en/services/privatebin
-  Upload: 
+  Upload:
  Lufi: https://framagit.org/fiat-tux/hat-softwares/lufi
-  Search: 
+  Search:
  Searx: https://github.com/asciimoo/searx
-  Polls: 
+  Polls:
  Framadate: https://git.framasoft.org/framasoft/framadate
-  Project Board: 
+  Project Board:
  Taiga: https://github.com/taigaio/
  Website: https://git.fosscommunity.in/disroot/website + some other repositories https://git.fosscommunity.in/disroot/
 
-   
+
    Dudle: https://github.com/kellerben/dudle/
-   
+
    LibreOffice: https://gerrit.libreoffice.org/
-   
+
 ## PC Operating Systems
  QubesOS: https://github.com/QubesOS
- 
+
  Debian: https://codesearch.debian.net/
- 
+
  Trisquel: https://devel.trisquel.info/groups/trisquel
- 
+
   Worth Mentioning:
-   
+
    OpenBSD: https://github.com/openbsd
-   
+
    Arch Linux: https://git.archlinux.org/
-   
+
    Parabola: https://projects.parabola.nu/
-   
+
    Whonix: https://github.com/Whonix/Whonix
-   
+
-   Subgraph OS: https://github.com/subgraph
-   
 ## Live CD Operating Systems
    Tails: https://tails.boum.org/contribute/git/
-   
+
    KNOPPIX: Unknown (More info https://knopper.net/knoppix-info/index-en.html)
   LXDE: https://github.com/lxde
   MPlayer: svn://svn.mplayerhq.hu/mplayer/trunk
   WvDial: https://github.com/wlach/wvdial
   Gimp: https://gitlab.gnome.org/GNOME/gimp
   LibreOffice: https://git.libreoffice.org/core
-   
+
    PuppyLinux: http://puppylinux.com/woof-ce.html
-   
+
    Worth Mentioing
 .    
-    Tiny Core Linux: 
+    Tiny Core Linux:
     https://www.openhub.net/p/tinycorelinux/enlistments
-   
+
 ## Live CD Operating Systems
    LineageOS: https://github.com/lineageos
-.   
+.
     Worth Mentioning
-.     
+.
      Replicant: https://git.replicant.us/replicant
-.     
+.
      OmniROM: https://www.omnirom.org/source
-.     
+.
      MicroG: https://github.com/microg
-     
+
 ## Android Privacy Add-ons
    NetGuard: https://github.com/M66B/NetGuard/
-   
+
    XPrivacyLua: https://github.com/M66B/XPrivacyLua/
-   
+
 ## Open Source Router Firmware
    OpenWRT: https://git.openwrt.org/?p=openwrt/openwrt.git;a=shortlog;h=refs/tags/v18.06.1
-   
+
    pfSense: http://github.com/pfsense
-   
+
    libreCMC: https://gogs.librecmc.org/libreCMC/libreCMC
-.   
+.
     Worth Mentioning:
-    
+
-   
+
    OpenBSD: https://github.com/openbsd
-   
+
    DD-WRT: https://svn.dd-wrt.com//
-