PrivacyTools has become Privacy Guides (#2430 )

Remove NixNet DNS and LibreDNS (#2421 )
Update Invidious domain and logo (#2428 )
2022-06-24 23:24:44 +09:30 · 2021-09-12 13:53:44 +00:00 · 2021-09-12 13:51:51 +00:00 · 2021-07-30 13:33:51 +00:00 · 2021-07-29 03:51:54 +00:00 · 2021-07-29 03:46:11 +00:00
47 changed files with 446 additions and 411 deletions
--- a/.github/ISSUE_TEMPLATE/1_Software_Suggestion.md
+++ b/.github/ISSUE_TEMPLATE/1_Software_Suggestion.md
@ -22,6 +22,6 @@ labels: 🆕 software suggestion

 ## My connection with the software

-<!-- Are you the author? Enthustiastic or early adopter? Friends with the author or requested by them to open the isue? An employee of the software maker? -->
+<!-- Are you the author? Enthusiastic or early adopter? Friends with the author or requested by them to open the issue? An employee of the software maker? -->

 - [ ] I will keep the issue up-to-date if something I have said changes or I remember a connection with the software.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -1,13 +1,14 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    activesupport (4.2.11.1)
-      i18n (~> 0.7)
+    activesupport (6.0.3.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
      tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
    coffee-script (2.4.1)
      coffee-script-source
      execjs
@ -15,65 +16,65 @@ GEM
    colorator (1.1.0)
    commonmarker (0.17.13)
      ruby-enum (~> 0.5)
-    concurrent-ruby (1.1.5)
-    dnsruby (1.61.3)
-      addressable (~> 2.5)
-    em-websocket (0.5.1)
+    concurrent-ruby (1.1.7)
+    dnsruby (1.61.5)
+      simpleidn (~> 0.1)
+    em-websocket (0.5.2)
      eventmachine (>= 0.12.9)
      http_parser.rb (~> 0.6.0)
    ethon (0.12.0)
      ffi (>= 1.3.0)
    eventmachine (1.2.7)
    execjs (2.7.0)
-    faraday (0.15.4)
+    faraday (1.2.0)
      multipart-post (>= 1.2, < 3)
-    ffi (1.11.1)
+      ruby2_keywords
+    ffi (1.14.2)
    forwardable-extended (2.6.0)
    gemoji (3.0.1)
-    github-pages (198)
-      activesupport (= 4.2.11.1)
+    github-pages (209)
      github-pages-health-check (= 1.16.1)
-      jekyll (= 3.8.5)
-      jekyll-avatar (= 0.6.0)
+      jekyll (= 3.9.0)
+      jekyll-avatar (= 0.7.0)
      jekyll-coffeescript (= 1.1.1)
-      jekyll-commonmark-ghpages (= 0.1.5)
+      jekyll-commonmark-ghpages (= 0.1.6)
      jekyll-default-layout (= 0.1.4)
-      jekyll-feed (= 0.11.0)
+      jekyll-feed (= 0.15.1)
      jekyll-gist (= 1.5.0)
-      jekyll-github-metadata (= 2.12.1)
-      jekyll-mentions (= 1.4.1)
-      jekyll-optional-front-matter (= 0.3.0)
+      jekyll-github-metadata (= 2.13.0)
+      jekyll-mentions (= 1.6.0)
+      jekyll-optional-front-matter (= 0.3.2)
      jekyll-paginate (= 1.1.0)
-      jekyll-readme-index (= 0.2.0)
-      jekyll-redirect-from (= 0.14.0)
-      jekyll-relative-links (= 0.6.0)
-      jekyll-remote-theme (= 0.3.1)
+      jekyll-readme-index (= 0.3.0)
+      jekyll-redirect-from (= 0.16.0)
+      jekyll-relative-links (= 0.6.1)
+      jekyll-remote-theme (= 0.4.2)
      jekyll-sass-converter (= 1.5.2)
-      jekyll-seo-tag (= 2.5.0)
-      jekyll-sitemap (= 1.2.0)
-      jekyll-swiss (= 0.4.0)
+      jekyll-seo-tag (= 2.6.1)
+      jekyll-sitemap (= 1.4.0)
+      jekyll-swiss (= 1.0.0)
      jekyll-theme-architect (= 0.1.1)
      jekyll-theme-cayman (= 0.1.1)
      jekyll-theme-dinky (= 0.1.1)
-      jekyll-theme-hacker (= 0.1.1)
+      jekyll-theme-hacker (= 0.1.2)
      jekyll-theme-leap-day (= 0.1.1)
      jekyll-theme-merlot (= 0.1.1)
      jekyll-theme-midnight (= 0.1.1)
      jekyll-theme-minimal (= 0.1.1)
      jekyll-theme-modernist (= 0.1.1)
-      jekyll-theme-primer (= 0.5.3)
+      jekyll-theme-primer (= 0.5.4)
      jekyll-theme-slate (= 0.1.1)
      jekyll-theme-tactile (= 0.1.1)
      jekyll-theme-time-machine (= 0.1.1)
-      jekyll-titles-from-headings (= 0.5.1)
-      jemoji (= 0.10.2)
-      kramdown (= 1.17.0)
-      liquid (= 4.0.0)
-      listen (= 3.1.5)
+      jekyll-titles-from-headings (= 0.5.3)
+      jemoji (= 0.12.0)
+      kramdown (= 2.3.0)
+      kramdown-parser-gfm (= 1.1.0)
+      liquid (= 4.0.3)
      mercenary (~> 0.3)
-      minima (= 2.5.0)
-      nokogiri (>= 1.8.5, < 2.0)
-      rouge (= 2.2.1)
+      minima (= 2.5.1)
+      nokogiri (>= 1.10.4, < 2.0)
+      rouge (= 3.23.0)
      terminal-table (~> 1.4)
    github-pages-health-check (1.16.1)
      addressable (~> 2.3)
@ -81,68 +82,70 @@ GEM
      octokit (~> 4.0)
      public_suffix (~> 3.0)
      typhoeus (~> 1.3)
-    html-pipeline (2.12.0)
+    html-pipeline (2.14.0)
      activesupport (>= 2)
      nokogiri (>= 1.4)
    http_parser.rb (0.6.0)
    i18n (0.9.5)
      concurrent-ruby (~> 1.0)
-    jekyll (3.8.5)
+    jekyll (3.9.0)
      addressable (~> 2.4)
      colorator (~> 1.0)
      em-websocket (~> 0.5)
      i18n (~> 0.7)
      jekyll-sass-converter (~> 1.0)
      jekyll-watch (~> 2.0)
-      kramdown (~> 1.14)
+      kramdown (>= 1.17, < 3)
      liquid (~> 4.0)
      mercenary (~> 0.3.3)
      pathutil (~> 0.9)
      rouge (>= 1.7, < 4)
      safe_yaml (~> 1.0)
-    jekyll-avatar (0.6.0)
-      jekyll (~> 3.0)
+    jekyll-avatar (0.7.0)
+      jekyll (>= 3.0, < 5.0)
    jekyll-coffeescript (1.1.1)
      coffee-script (~> 2.2)
      coffee-script-source (~> 1.11.1)
    jekyll-commonmark (1.3.1)
      commonmarker (~> 0.14)
      jekyll (>= 3.7, < 5.0)
-    jekyll-commonmark-ghpages (0.1.5)
+    jekyll-commonmark-ghpages (0.1.6)
      commonmarker (~> 0.17.6)
-      jekyll-commonmark (~> 1)
-      rouge (~> 2)
+      jekyll-commonmark (~> 1.2)
+      rouge (>= 2.0, < 4.0)
    jekyll-default-layout (0.1.4)
      jekyll (~> 3.0)
-    jekyll-feed (0.11.0)
-      jekyll (~> 3.3)
+    jekyll-feed (0.15.1)
+      jekyll (>= 3.7, < 5.0)
    jekyll-gist (1.5.0)
      octokit (~> 4.2)
-    jekyll-github-metadata (2.12.1)
-      jekyll (~> 3.4)
+    jekyll-github-metadata (2.13.0)
+      jekyll (>= 3.4, < 5.0)
      octokit (~> 4.0, != 4.4.0)
-    jekyll-mentions (1.4.1)
+    jekyll-mentions (1.6.0)
      html-pipeline (~> 2.3)
-      jekyll (~> 3.0)
-    jekyll-optional-front-matter (0.3.0)
-      jekyll (~> 3.0)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-optional-front-matter (0.3.2)
+      jekyll (>= 3.0, < 5.0)
    jekyll-paginate (1.1.0)
-    jekyll-readme-index (0.2.0)
-      jekyll (~> 3.0)
-    jekyll-redirect-from (0.14.0)
-      jekyll (~> 3.3)
-    jekyll-relative-links (0.6.0)
-      jekyll (~> 3.3)
-    jekyll-remote-theme (0.3.1)
-      jekyll (~> 3.5)
-      rubyzip (>= 1.2.1, < 3.0)
+    jekyll-readme-index (0.3.0)
+      jekyll (>= 3.0, < 5.0)
+    jekyll-redirect-from (0.16.0)
+      jekyll (>= 3.3, < 5.0)
+    jekyll-relative-links (0.6.1)
+      jekyll (>= 3.3, < 5.0)
+    jekyll-remote-theme (0.4.2)
+      addressable (~> 2.0)
+      jekyll (>= 3.5, < 5.0)
+      jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
+      rubyzip (>= 1.3.0, < 3.0)
    jekyll-sass-converter (1.5.2)
      sass (~> 3.4)
-    jekyll-seo-tag (2.5.0)
-      jekyll (~> 3.3)
-    jekyll-sitemap (1.2.0)
-      jekyll (~> 3.3)
-    jekyll-swiss (0.4.0)
+    jekyll-seo-tag (2.6.1)
+      jekyll (>= 3.3, < 5.0)
+    jekyll-sitemap (1.4.0)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-swiss (1.0.0)
    jekyll-theme-architect (0.1.1)
      jekyll (~> 3.5)
      jekyll-seo-tag (~> 2.0)
@ -152,8 +155,8 @@ GEM
    jekyll-theme-dinky (0.1.1)
      jekyll (~> 3.5)
      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-hacker (0.1.1)
-      jekyll (~> 3.5)
+    jekyll-theme-hacker (0.1.2)
+      jekyll (> 3.5, < 5.0)
      jekyll-seo-tag (~> 2.0)
    jekyll-theme-leap-day (0.1.1)
      jekyll (~> 3.5)
@ -170,8 +173,8 @@ GEM
    jekyll-theme-modernist (0.1.1)
      jekyll (~> 3.5)
      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-primer (0.5.3)
-      jekyll (~> 3.5)
+    jekyll-theme-primer (0.5.4)
+      jekyll (> 3.5, < 5.0)
      jekyll-github-metadata (~> 2.9)
      jekyll-seo-tag (~> 2.0)
    jekyll-theme-slate (0.1.1)
@ -183,43 +186,49 @@ GEM
    jekyll-theme-time-machine (0.1.1)
      jekyll (~> 3.5)
      jekyll-seo-tag (~> 2.0)
-    jekyll-titles-from-headings (0.5.1)
-      jekyll (~> 3.3)
+    jekyll-titles-from-headings (0.5.3)
+      jekyll (>= 3.3, < 5.0)
    jekyll-watch (2.2.1)
      listen (~> 3.0)
-    jemoji (0.10.2)
+    jemoji (0.12.0)
      gemoji (~> 3.0)
      html-pipeline (~> 2.2)
-      jekyll (~> 3.0)
-    kramdown (1.17.0)
-    liquid (4.0.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
+      jekyll (>= 3.0, < 5.0)
+    kramdown (2.3.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    liquid (4.0.3)
+    listen (3.3.3)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
    mercenary (0.3.6)
-    mini_portile2 (2.4.0)
-    minima (2.5.0)
-      jekyll (~> 3.5)
+    mini_portile2 (2.5.0)
+    minima (2.5.1)
+      jekyll (>= 3.5, < 5.0)
      jekyll-feed (~> 0.9)
      jekyll-seo-tag (~> 2.1)
-    minitest (5.11.3)
+    minitest (5.14.2)
    multipart-post (2.1.1)
-    nokogiri (1.10.8)
-      mini_portile2 (~> 2.4.0)
-    octokit (4.14.0)
+    nokogiri (1.11.2)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    octokit (4.19.0)
+      faraday (>= 0.9)
      sawyer (~> 0.8.0, >= 0.5.3)
    pathutil (0.16.2)
      forwardable-extended (~> 2.6)
    public_suffix (3.1.1)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    racc (1.5.2)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
      ffi (~> 1.0)
-    rouge (2.2.1)
-    ruby-enum (0.7.2)
+    rexml (3.2.5)
+    rouge (3.23.0)
+    ruby-enum (0.8.0)
      i18n
-    ruby_dep (1.5.0)
-    rubyzip (2.0.0)
+    ruby2_keywords (0.0.2)
+    rubyzip (2.3.0)
    safe_yaml (1.0.5)
    sass (3.7.4)
      sass-listen (~> 4.0.0)
@ -229,14 +238,20 @@ GEM
    sawyer (0.8.2)
      addressable (>= 2.3.5)
      faraday (> 0.8, < 2.0)
+    simpleidn (0.1.1)
+      unf (~> 0.1.4)
    terminal-table (1.8.0)
      unicode-display_width (~> 1.1, >= 1.1.1)
    thread_safe (0.3.6)
-    typhoeus (1.3.1)
+    typhoeus (1.4.0)
      ethon (>= 0.9.0)
-    tzinfo (1.2.5)
+    tzinfo (1.2.9)
      thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.7)
+    unicode-display_width (1.7.0)
+    zeitwerk (2.4.2)

 PLATFORMS
  ruby
--- a/README.md
+++ b/README.md
@ -1,68 +1,36 @@
 <div align="center">
-<a href="https://www.privacytools.io">
-	<img src="assets/img/svg/layout/brand/horizontal.svg" width="500px" alt="PrivacyTools" />
+<a href="https://www.privacyguides.org">
+	<img src="assets/img/svg/layout/brand/horizontal.svg" width="400px" alt="PrivacyTools" />
 </a>
 <p>
 	<em>Encryption Against Global Mass Surveillance.</em>
 </p>
-<a href="https://opencollective.com/privacytools#support">
-	<img src="https://opencollective.com/privacytools/tiers/badge.svg">
-</a>
-<a href="https://app.netlify.com/sites/privacytools-io/deploys">
-	<img src="https://api.netlify.com/api/v1/badges/afd98777-c205-4928-a301-f57a1448113f/deploy-status">
-</a>
 </div>

 # Contributing

-It's important for a website like PrivacyTools to be up-to-date. Keep an eye on software updates of the applications listed here. Follow recent news about providers that are recommended. We try our best to keep up but we're not perfect and the internet is changing fast. So if you find an error, or you think a provider should not be listed here, or a qualified service provider is missing or a browser plugin is not the best choice anymore or anything else...
+## This project is archived.

-**Talk to us!** If you want to help make privacytools.io the best website it can be, join our Matrix discussion chat at [`#dev:privacytools.io`](https://matrix.to/#/#dev:privacytools.io), where we talk about open issues and PRs in this repo, and changes to the site. You may submit any website suggestions here on GitHub [Issues](https://github.com/privacytools/privacytools.io/issues). Please refer to the [contribution guidelines](.github/CONTRIBUTING.md) and consider stopping by our chat room before submitting. Thank you.
+See our [Welcome to Privacy Guides](https://www.privacyguides.org/blog/2021/09/14/welcome-to-privacy-guides) post for more information. Our project has now moved on to [Privacy Guides](https://privacyguides.org).

-If you want to discuss privacy in general, a new tool, or just something else, feel free to join [our Discourse community](https://forum.privacytools.io/) or our general Matrix room at [`#general:privacytools.io`](https://matrix.to/#/#general:privacytools.io) and start a discussion! This is a community project and we're aiming to deliver the best information available. Thank you for participating.
+It's important for a website on privacy to be up-to-date. Keep an eye on software updates of the applications listed [here](https://github.com/privacyguides/). Follow recent news about providers that are recommended. We try our best to keep up but we're not perfect and the internet is changing fast. So if you find an error, or you think a provider should not be listed, or a qualified service provider is missing or a browser plugin is not the best choice anymore or anything else, feel free to open a [discussion](https://github.com/privacyguides/privacyguides.org/discussions) or [issue](https://github.com/privacyguides/privacyguides.org/issues) to correct errors.

-## Developing
+**Talk to us!** If you want to help join our lounge chat at [`#lounge:privacyguides.org`](https://matrix.to/#/#lounge:privacyguides.org), or for our on-topic privacy discussion room [`#main:privacyguides.org`](https://matrix.to/#/#main:privacyguides.org).

-1. Install the latest stable version of [Ruby](https://www.ruby-lang.org/en/downloads/).
-1. Install [Bundler](https://bundler.io/) v2.0.1:
-	* `gem install bundler -v 2.0.1`
-1. Install the required dependencies:
-	* `bundle install`
-1. Build the website (the output can be found in the `_site` directory):
-	* `bundle exec jekyll build`
-1. Serve the website locally with live reloading:
-	* `bundle exec jekyll serve --incremental --livereload`
+# Support PrivacyGuides

-# Support
-
- [Donate](https://www.privacytools.io/sponsors/)
- [Spread the word](https://www.privacytools.io/#participate)
- [Join our Discourse community](https://forum.privacytools.io/)
- [Make suggestions on reddit](https://www.reddit.com/r/privacytoolsIO/)
+- [Donate](https://opencollective.com/privacyguides)
+- [Our reddit community](https://www.reddit.com/r/privacyguides/)
 - View and edit our website source code here on GitHub.

 ## Backers

-Like what we're doing? [Become a backer](https://opencollective.com/privacytools) and show your support for our project.
+Like what we're doing? [Become a backer](https://opencollective.com/privacyguides) and show your support for our project.

-<a href="https://opencollective.com/privacytools">
-	<img src="https://opencollective.com/privacytools/tiers/sponsor.svg?avatarHeight=64&width=890" height="64px" width="890px" alt="opencollective.com" />
+<a href="https://opencollective.com/privacyguides">
+	<img src="https://opencollective.com/privacyguides/tiers/sponsor.svg?avatarHeight=64&width=890" height="64px" width="890px" alt="opencollective.com" />
 </a>

-## Sponsors
-
-Are you working with a privacy focused company? Ask your manager or marketing team if your company would be interested in supporting our project. Your support will help us continue to develop this website, promote privacy-respecting tools and services, and reach out to thousands of data privacy newcomers every month. Also, your company's logo will show on GitHub and [our site](https://www.privacytools.io/sponsors/), and who doesn't like a little extra exposure?
-
-## 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)
- [Русский / Russian](https://privacytools.ru) - [GitHub](https://github.com/c0rdis/privacytools.ru)
- [Português / Portuguese](https://www.privacidade.digital/) - [GitHub](https://github.com/PrivacidadeDigital/privacidade.digital)
-
 # License & Notices

-Please visit [https://www.privacytools.io/notices/](https://www.privacytools.io/notices/) for license information and other disclaimers. PrivacyTools is provided on an "as-is" basis, without warranty, and disclaiming liability for damages. By contributing to this repository you agree to license your work under the terms of the [license](https://github.com/privacytools/privacytools.io/blob/master/LICENSE.txt) in this repository.
+PrivacyTools was provided on an "as-is" basis, without warranty, and disclaiming liability for damages. The project was licensed under these terms [license](https://github.com/privacytools/privacytools.io/blob/master/LICENSE.txt).
--- a/_includes/badge.html
+++ b/_includes/badge.html
@ -3,7 +3,7 @@
  href="{{ include.link }}" class="badge badge-{{ include.color | default: "info" }}"
  {% if include.tooltip %}
  data-toggle="tooltip"
-  title="{{ include.tooltip }}"><i class="{{ include.icon | default: "far fa-question-circle"}}"></i> {{ include.text }}
+  data-original-title="{{ include.tooltip }}"><i class="{{ include.icon | default: "far fa-question-circle"}}"></i> {{ include.text }}
 {% else %}><i class="{{ include.icon | default: "fas fa-external-link-alt"}}"></i> {{ include.text }}{% endif %}
 </a>
 {% else %}
@ -11,7 +11,7 @@
  class="badge badge-{{ include.color | default: "info" }}"
  {% if include.tooltip %}
    data-toggle="tooltip"
-    title="{{ include.tooltip }}"
+    data-original-title="{{ include.tooltip }}"
    > <i class="{{ include.icon | default: "far fa-question-circle"}}"></i> {{include.text}}
  {% else %}
    > {% if include.icon %}<i class="{{ include.icon }}"></i>{% endif %} {{include.text}}
--- a/_includes/card.html
+++ b/_includes/card.html
@ -17,7 +17,7 @@
                    {% assign text = label_data[1] %}
                    {% assign tooltip = label_data[2] | default: "" %}
                    {% assign help_icon = '<i class="far fa-question-circle"></i>' %}
-                    <span class="badge badge-{{color}}" {% if tooltip %} data-toggle="tooltip" title="{{ tooltip }}">{{text}} {{ help_icon
+                    <span class="badge badge-{{color}}" {% if tooltip %} data-toggle="tooltip" data-original-title="{{ tooltip }}">{{text}} {{ help_icon
                        }}
                        {% else %}
                        >{{text}}
--- a/_includes/cardv2.html
+++ b/_includes/cardv2.html
@ -14,7 +14,7 @@
            class="badge badge-{{color}}"
            {% if tooltip %}
              data-toggle="tooltip"
-              title="{{ tooltip }}"
+              data-original-title="{{ tooltip }}"
              > {{text}} {{ help_icon }}
            {% else %}
              > {{text}}
--- a/_includes/footer.html
+++ b/_includes/footer.html
@ -55,7 +55,7 @@
      <span class="fab fa-creative-commons-zero fa-2x mr-2"></span>
      <a
        href="/LICENSE.txt"
-        title="This work is free. You can redistribute it and/or modify it under the terms of the &quot;Creative Commons CC0 1.0 Universal Public Domain Dedication&quot;."
+        data-original-title="This work is free. You can redistribute it and/or modify it under the terms of the &quot;Creative Commons CC0 1.0 Universal Public Domain Dedication&quot;."
        data-toggle="tooltip"
        data-placement="top">
        CC0
--- a/_includes/nav.html
+++ b/_includes/nav.html
@ -91,6 +91,7 @@
            <a class="dropdown-item" href="/operating-systems/#tor_os"><span class="ptio-tor"></span> Tor focused distributions</a>
            <a class="dropdown-item" href="/operating-systems/#mobile_os"><span class="fas fa-mobile-alt fa-fw"></span> Mobile OS</a>
            <a class="dropdown-item" href="/operating-systems/#aaddons"><span class="fas fa-th fa-fw"></span> Android Privacy Add-ons</a>
+            <a class="dropdown-item" href="/operating-systems/#iaddons"><span class="fas fa-th fa-fw"></span> iOS Privacy Add-ons</a>
            <a class="dropdown-item" href="/operating-systems/#firmware"><span class="fas fa-signal fa-fw"></span> Router Firmware</a>
            <a class="dropdown-item" href="/operating-systems/#win10"><span class="far fa-thumbs-down fa-fw"></span> Don't use Windows 10</a>
          </span>
--- a/_includes/scripts.html
+++ b/_includes/scripts.html
@ -1,5 +1,4 @@
-<script src="/assets/js/jquery-3.3.1.min.js?v=4"></script>
-<script src="/assets/js/popper.min.js?v=4"></script>
-<script src="/assets/js/bootstrap.min.js?v=4"></script>
+<script src="/assets/js/popper.min.js?v=5"></script>
+<script src="/assets/js/bootstrap.min.js?v=5"></script>
 <script src="/assets/js/sortable.min.js?v=4"></script>
 <script src="/assets/js/main.js?v=5"></script>
--- a/_includes/sections/browser-addons.html
+++ b/_includes/sections/browser-addons.html
@ -138,7 +138,7 @@
 <h3>Android</h3>

 <div class="alert alert-warning" role="alert">
-  Unfortunately the Android version of Firefox <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1398097">doesn't support managing tabs as containers</a>. The recommended extensions below are a substitute, however as APIs do not exist for clearing <a href="https://en.wikipedia.org/wiki/Indexed_Database_API">IndexedDB</a>, <a href="https://en.wikipedia.org/wiki/Progressive_web_application#Service_workers">Service Workers</a> cache, <a href="https://en.wikipedia.org/wiki/Progressive_web_application#AppCache_(obsolete)">appCache</a>, or cache by host. As a result they are not as good as the above Temporary Container suggestions.
+  Unfortunately the Android version of Firefox <a href="https://github.com/stoically/temporary-containers/issues/465">doesn't yet have Temporary Container support</a>. The recommended extensions below are a substitute, however as APIs do not exist for clearing <a href="https://en.wikipedia.org/wiki/Indexed_Database_API">IndexedDB</a>, <a href="https://en.wikipedia.org/wiki/Progressive_web_application#Service_workers">Service Workers</a> cache, <a href="https://en.wikipedia.org/wiki/Progressive_web_application#AppCache_(obsolete)">appCache</a>, or cache by host. As a result they are not as good as the above Temporary Container suggestions.
 </div>

 {% include cardv2.html
--- a/_includes/sections/browser-recommendation.html
+++ b/_includes/sections/browser-recommendation.html
@ -112,7 +112,7 @@
 {% include cardv2.html
  title="Onion Browser"
  image="/assets/img/svg/3rd-party/onion_browser.svg"
-  description='Onion Browser is an open-source browser that lets you browse the web anonymously over the Tor network on iOS devices and is endorsed by the Tor Project. Warning: there are certain anonymity-related <a href="https://onionbrowser.com/about">issues</a> with Onion Browser due to iOS limitations.'
+  description='Onion Browser is an open-source browser that lets you browse the web anonymously over the Tor network on iOS devices and is endorsed by the <a href="https://support.torproject.org/glossary/onion-browser/">Tor Project</a>. Warning: there are certain anonymity-related <a href="https://onionbrowser.com/about">issues</a> with Onion Browser due to iOS limitations.'
  website="https://onionbrowser.com/"
  privacy-policy="https://onionbrowser.com/privacy-policy"
  forum="https://forum.privacytools.io/t/discussion-onion-browser-browsers/1523"
--- a/_includes/sections/cloud-storage.html
+++ b/_includes/sections/cloud-storage.html
@ -26,6 +26,6 @@
 <h3>Worth Mentioning</h3>

 <ul>
-  <li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration. {% include badge.html color="warning" tooltip="Cryptomator's mobile apps are not open-source." link="https://github.com/cryptomator/cryptomator-android/issues/1#issuecomment-257979375" icon="fas fa-exclamation-triangle" %}</li>
+  <li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration.</li>
  <li><a href="https://cryptpad.fr">CryptPad</a> - Free and end-to-end encrypted real time collaboration sharing folders, media, and documents.</li>
 </ul>
--- a/_includes/sections/dns.html
+++ b/_includes/sections/dns.html
@ -95,7 +95,7 @@ We also log how many times this or that tracker has been blocked. We need this i
        <td>
          <div
            class="btn-secondary btn-icon"
-            title="&quot;No logs.&quot;"
+            data-original-title="&quot;No logs.&quot;"
            data-toggle="tooltip"
            data-placement="bottom">
            <span class="fas fa-globe"></span>
@ -186,7 +186,7 @@ We also log how many times this or that tracker has been blocked. We need this i
        <td>
          <div
            class="btn-secondary btn-icon"
-            title="&quot;CZ.NIC resolvers neither collect any personal data nor gather information on pages where your computer sends personal data.&quot;"
+            data-original-title="&quot;CZ.NIC resolvers neither collect any personal data nor gather information on pages where your computer sends personal data.&quot;"
            data-toggle="tooltip"
            data-placement="bottom">
            <span class="fas fa-globe"></span>
@ -239,52 +239,7 @@ We also log how many times this or that tracker has been blocked. We need this i
          </span>
        </td>
      </tr>
-
-      <tr>
-        <td data-value="LibreDNS">
-          <a href="https://libredns.gr/">LibreDNS</a>
-        </td>
-        <td>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-de"></span>
-            Germany
-          </span>
-        </td>
-        <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://libreops.cc/terms.html">
-            <span class="fas fa-globe"></span>
-          </a>
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="Part of LibreHosters, &quot;a network of cooperation and solidarity that uses free software to encourage decentralisation through federation and distributed platforms.&quot;" href="https://libreho.st/">
-            Informal collective
-          </a>
-        </td>
-        <td>No</td>
-        <td>DoH, DoT</td>
-        <td>Yes</td>
-        <td>Yes</td>
-        <td>
-          <span class="no-text-wrap">
-            Based on server choice only for DoH
-          </span>
-        </td>
-        <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://gitlab.com/libreops/libredns">
-            <span class="fas fa-globe"></span>
-          </a>
-        </td>
-        <td>
-          <span class="no-text-wrap">
-            <a href="https://www.hetzner.com/">Hetzner Online GmbH</a>
-          </span>
-        </td>
-      </tr>
-
+      
      <tr>
        <td data-value="nextdns">
          <a href="https://www.nextdns.io/">NextDNS</a>
@ -317,61 +272,7 @@ We also log how many times this or that tracker has been blocked. We need this i
        <td>?</td>
        <td>Self</td>
      </tr>
-
-      <tr>
-        <td data-value="NixNet">
-          <a href="https://nixnet.xyz/dns/">NixNet</a>
-        </td>
-        <td>
-          <span class="no-text-wrap">
-            Anycast (based in
-            <span class="flag-icon flag-icon-us"></span>
-            US),
-          </span>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-us"></span>
-            US,
-          </span>
-          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-lu"></span>
-            Luxembourg
-          </span>
-        </td>
-        <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://nixnet.xyz/privacy/">
-            <span class="fas fa-globe"></span>
-          </a>
-        </td>
-        <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title='Part of LibreHosters, "a network of cooperation and solidarity that uses free software to encourage decentralisation through federation and distributed platforms."' href="https://libreho.st/">
-            Informal collective
-          </a>
-        </td>
-        <td>No</td>
-        <td>DoH, DoT</td>
-        <td>Yes</td>
-        <td>Yes</td>
-        <td>
-          <span class="no-text-wrap">
-            Based on server choice
-          </span>
-        </td>
-        <td>
-          <a
-            class="btn-secondary btn-icon"
-            href="https://git.nixnet.xyz/NixNet/dns">
-            <span class="fas fa-globe"></span>
-          </a>
-        </td>
-        <td>
-          <span class="no-text-wrap">
-            <a href="https://frantech.ca/">FranTech Solutions</a>
-          </span>
-        </td>
-      </tr>
-
+      
      <tr>
        <td data-value="PowerDNS">
          <a href="https://powerdns.org/">PowerDNS</a>
@ -415,8 +316,8 @@ We also log how many times this or that tracker has been blocked. We need this i
        </td>
        <td>Anycast (based in
          <span class="no-text-wrap">
-            <span class="flag-icon flag-icon-us"></span>
-            US)
+            <span class="flag-icon flag-icon-ch"></span>
+            Switzerland)
          </span>
        </td>
        <td>
@ -507,7 +408,7 @@ We also log how many times this or that tracker has been blocked. We need this i
        <td>
          <div
            class="btn-secondary btn-icon"
-            title="&quot;Absolutely nothing is being logged, neither about the users nor the usage of this service. I do keep graphs of the total number of queries, but no personally identifiable information is saved. The data that is saved will never be sold or used for anything except capacity planning of the service.&quot;"
+            data-original-title="&quot;Absolutely nothing is being logged, neither about the users nor the usage of this service. I do keep graphs of the total number of queries, but no personally identifiable information is saved. The data that is saved will never be sold or used for anything except capacity planning of the service.&quot;"
            data-toggle="tooltip"
            data-placement="bottom">
            <span class="fas fa-globe"></span>
@ -515,7 +416,7 @@ We also log how many times this or that tracker has been blocked. We need this i
        </td>
        <td>Hobby Project</td>
        <td>No</td>
-        <td data-value="doh">DoT</td> <!-- "hack" to group "DoT" values (when sorted) with "DoH" values -->
+        <td data-value="doh">DoH, DoT</td> <!-- "hack" to group "DoT" values (when sorted) with "DoH" values -->
        <td>Yes</td>
        <td>No</td>
        <td>No</td>
@ -538,97 +439,113 @@ We also log how many times this or that tracker has been blocked. We need this i
 </h1>

 {%
-	include cardv2.html
-	title="Unbound"
-	image="/assets/img/svg/3rd-party/unbound.svg"
-	description='A validating, recursive, caching DNS resolver, supporting DNS-over-TLS, and has been <a href="https://ostif.org/our-audit-of-unbound-dns-by-x41-d-sec-full-results/">independently audited</a>.'
-	website="https://nlnetlabs.nl/projects/unbound/about/"
-	forum="https://forum.privacytools.io/t/discussion-unbound/3563"
-	github="https://github.com/NLnetLabs/unbound"
+  include cardv2.html
+  title="Unbound"
+  image="/assets/img/svg/3rd-party/unbound.svg"
+  description='A validating, recursive, caching DNS resolver, supporting DNS-over-TLS, and has been <a href="https://ostif.org/our-audit-of-unbound-dns-by-x41-d-sec-full-results/">independently audited</a>.'
+  website="https://nlnetlabs.nl/projects/unbound/about/"
+  forum="https://forum.privacytools.io/t/discussion-unbound/3563"
+  github="https://github.com/NLnetLabs/unbound"
 %}

 {%
-	include cardv2.html
-	title="dnscrypt-proxy"
-	image="/assets/img/svg/3rd-party/dnscrypt-proxy.svg"
-	description='A DNS proxy with support for DNSCrypt, DNS-over-HTTPS, and <a href="https://github.com/DNSCrypt/dnscrypt-protocol/blob/master/ANONYMIZED-DNSCRYPT.txt">Anonymized DNSCrypt</a>, a <a href="https://github.com/DNSCrypt/dnscrypt-proxy/wiki/Anonymized-DNS">relay-based protocol that the hides client IP address.</a>'
-	website="https://github.com/DNSCrypt/dnscrypt-proxy/wiki"
-	forum="https://forum.privacytools.io/t/discussion-dnscrypt-proxy/1498"
-	github="https://github.com/DNSCrypt/dnscrypt-proxy"
+  include cardv2.html
+  title="dnscrypt-proxy"
+  image="/assets/img/svg/3rd-party/dnscrypt-proxy.svg"
+  description='A DNS proxy with support for DNSCrypt, DNS-over-HTTPS, and <a href="https://github.com/DNSCrypt/dnscrypt-protocol/blob/master/ANONYMIZED-DNSCRYPT.txt">Anonymized DNSCrypt</a>, a <a href="https://github.com/DNSCrypt/dnscrypt-proxy/wiki/Anonymized-DNS">relay-based protocol that the hides client IP address.</a>'
+  website="https://github.com/DNSCrypt/dnscrypt-proxy/wiki"
+  forum="https://forum.privacytools.io/t/discussion-dnscrypt-proxy/1498"
+  github="https://github.com/DNSCrypt/dnscrypt-proxy"
 %}

 {%
-	include cardv2.html
-	title="Stubby"
-	image="/assets/img/png/3rd-party/stubby.png"
-	description='An application that acts as a local DNS-over-TLS stub resolver. Stubby can be used in <a href="https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Clients#DNSPrivacyClients-Unbound/Stubbycombination">combination with Unbound</a> by managing the upstream TLS connections (since Unbound cannot yet re-use TCP/TLS connections) with Unbound providing a local cache.'
-	website="https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Daemon+-+Stubby"
-	forum="https://forum.privacytools.io/t/discussion-stubby/3582"
-	github="https://github.com/getdnsapi/stubby"
+  include cardv2.html
+  title="Stubby"
+  image="/assets/img/png/3rd-party/stubby.png"
+  description='An application that acts as a local DNS-over-TLS stub resolver. Stubby can be used in <a href="https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Clients#DNSPrivacyClients-Unbound/Stubbycombination">combination with Unbound</a> by managing the upstream TLS connections (since Unbound cannot yet re-use TCP/TLS connections) with Unbound providing a local cache.'
+  website="https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Daemon+-+Stubby"
+  forum="https://forum.privacytools.io/t/discussion-stubby/3582"
+  github="https://github.com/getdnsapi/stubby"
 %}

 {%
-	include cardv2.html
-	title="Firefox's built-in DNS-over-HTTPS resolver"
-	image="/assets/img/svg/3rd-party/firefox_browser.svg"
-	description='Firefox comes with built-in DNS-over-HTTPS support for <a href="https://blog.mozilla.org/blog/2020/02/25/firefox-continues-push-to-bring-dns-over-https-by-default-for-us-users/">NextDNS and Cloudflare</a> but users can manually any other DoH resolver.'
-	labels="color==warning::icon==fas fa-exclamation-triangle::link==https://developers.cloudflare.com/1.1.1.1/privacy/firefox::text==Warning::tooltip==Cloudflare logs a limited amount of data about the DNS requests that are sent to their custom resolver for Firefox."
-	website="https://support.mozilla.org/en-US/kb/firefox-dns-over-https"
-	privacy-policy="https://wiki.mozilla.org/Security/DOH-resolver-policy"
-	forum="https://forum.privacytools.io/t/discussion-firefox-s-built-in-dns-over-https-resolver/3564"
+  include cardv2.html
+  title="Firefox's built-in DNS-over-HTTPS resolver"
+  image="/assets/img/svg/3rd-party/firefox_browser.svg"
+  description='Firefox comes with built-in DNS-over-HTTPS support for <a href="https://blog.mozilla.org/blog/2020/02/25/firefox-continues-push-to-bring-dns-over-https-by-default-for-us-users/">NextDNS and Cloudflare</a> but users can manually use any other DoH resolver.'
+  labels="color==warning::icon==fas fa-exclamation-triangle::link==https://developers.cloudflare.com/1.1.1.1/privacy/firefox::text==Warning::tooltip==Cloudflare logs a limited amount of data about the DNS requests that are sent to their custom resolver for Firefox."
+  website="https://support.mozilla.org/en-US/kb/firefox-dns-over-https"
+  privacy-policy="https://wiki.mozilla.org/Security/DOH-resolver-policy"
+  forum="https://forum.privacytools.io/t/discussion-firefox-s-built-in-dns-over-https-resolver/3564"
 %}

 <h1 id="dns-android-clients" class="anchor">
-	<a href="#dns-android-clients">
-		<i class="fas fa-link anchor-icon"></i>
-	</a> Encrypted DNS Client Recommendations for Android
+  <a href="#dns-android-clients">
+    <i class="fas fa-link anchor-icon"></i>
+  </a> Encrypted DNS Client Recommendations for Android
 </h1>

 {%
-	include cardv2.html
-	title="Android 9's built-in DNS-over-TLS resolver"
-	image="/assets/img/svg/3rd-party/android.svg"
-	description="Android 9 (Pie) comes with built-in DNS-over-TLS support without the need for a 3rd-party application."
-	labels="color==warning::icon==fas fa-exclamation-triangle::link==https://developers.google.com/speed/public-dns/docs/using#android_9_pie_or_later::text==Warning::tooltip==Android 9's DoT settings have no effect when used concurrently with VPN-based apps which override the DNS."
-	website="https://support.google.com/android/answer/9089903#private_dns"
-	forum="https://forum.privacytools.io/t/discussion-android-9s-built-in-dns-over-tls-resolver/3562"
+  include cardv2.html
+  title="Android 9's built-in DNS-over-TLS resolver"
+  image="/assets/img/svg/3rd-party/android.svg"
+  description="Android 9 (Pie) comes with built-in DNS-over-TLS support without the need for a 3rd-party application."
+  labels="color==warning::icon==fas fa-exclamation-triangle::link==https://developers.google.com/speed/public-dns/docs/using#android_9_pie_or_later::text==Warning::tooltip==Android 9's DoT settings have no effect when used concurrently with VPN-based apps which override the DNS."
+  website="https://support.google.com/android/answer/9089903#private_dns"
+  forum="https://forum.privacytools.io/t/discussion-android-9s-built-in-dns-over-tls-resolver/3562"
 %}

 {%
-	include cardv2.html
-	title="Nebulo"
-	image="/assets/img/png/3rd-party/nebulo.png"
-	description='An open-source Android client supporting DNS-over-HTTPS and DNS-over-TLS, caching DNS responses, and locally logging DNS queries.'
-	website="https://git.frostnerd.com/PublicAndroidApps/smokescreen/-/blob/master/README.md"
-	privacy-policy="https://smokescreen.app/privacypolicy"
-	forum="https://forum.privacytools.io/t/discussion-nebulo/3565"
-	fdroid="https://git.frostnerd.com/PublicAndroidApps/smokescreen#f-droid"
-	googleplay="https://play.google.com/store/apps/details?id=com.frostnerd.smokescreen"
-	source="https://git.frostnerd.com/PublicAndroidApps/smokescreen"
+  include cardv2.html
+  title="Nebulo"
+  image="/assets/img/png/3rd-party/nebulo.png"
+  description='An open-source Android client supporting DNS-over-HTTPS and DNS-over-TLS, caching DNS responses, and locally logging DNS queries.'
+  website="https://git.frostnerd.com/PublicAndroidApps/smokescreen/-/blob/master/README.md"
+  privacy-policy="https://smokescreen.app/privacypolicy"
+  forum="https://forum.privacytools.io/t/discussion-nebulo/3565"
+  fdroid="https://git.frostnerd.com/PublicAndroidApps/smokescreen#f-droid"
+  googleplay="https://play.google.com/store/apps/details?id=com.frostnerd.smokescreen"
+  source="https://git.frostnerd.com/PublicAndroidApps/smokescreen"
 %}

 <h1 id="dns-ios-clients" class="anchor">
-	<a href="#dns-ios-clients">
-		<i class="fas fa-link anchor-icon"></i>
-	</a> Encrypted DNS Client Recommendations for iOS
+  <a href="#dns-ios-clients">
+    <i class="fas fa-link anchor-icon"></i>
+  </a> Encrypted DNS Client Recommendations for iOS
 </h1>

 {%
-	include cardv2.html
-	title="DNSCloak"
-	image="/assets/img/png/3rd-party/dnscloak.png"
-	description='An open-source iOS client supporting DNS-over-HTTPS, DNSCrypt, and <a href="https://github.com/DNSCrypt/dnscrypt-proxy/wiki">dnscrypt-proxy</a> options such as caching DNS responses, locally logging DNS queries, and custom block lists. Users can <a href="https://blog.privacytools.io/adding-custom-dns-over-https-resolvers-to-dnscloak/">add custom resolvers by DNS stamp</a>.'
-	website="https://github.com/s-s/dnscloak/blob/master/README.md"
-	privacy-policy="https://drive.google.com/file/d/1050No_pU74CAWUS5-BwQWyO2x_aiMzWc/view"
-	forum="https://forum.privacytools.io/t/discussion-dnscloak/3566"
-	ios="https://apps.apple.com/app/id1452162351"
-	github="https://github.com/s-s/dnscloak"
+  include cardv2.html
+  title="DNSCloak"
+  image="/assets/img/png/3rd-party/dnscloak.png"
+  description='An open-source iOS client supporting DNS-over-HTTPS, DNSCrypt, and <a href="https://github.com/DNSCrypt/dnscrypt-proxy/wiki">dnscrypt-proxy</a> options such as caching DNS responses, locally logging DNS queries, and custom block lists. Users can <a href="https://blog.privacytools.io/adding-custom-dns-over-https-resolvers-to-dnscloak/">add custom resolvers by DNS stamp</a>.'
+  website="https://github.com/s-s/dnscloak/blob/master/README.md"
+  privacy-policy="https://drive.google.com/file/d/1050No_pU74CAWUS5-BwQWyO2x_aiMzWc/view"
+  forum="https://forum.privacytools.io/t/discussion-dnscloak/3566"
+  ios="https://apps.apple.com/app/id1452162351"
+  github="https://github.com/s-s/dnscloak"
 %}

+<h2 id="appledns" class="anchor">
+  <a href="#appledns">
+    <i class="fas fa-link anchor-icon"></i>
+  </a>Apple's native support
+</h2>
+
+<p>
+  In iOS, iPadOS, tvOS 14 and macOS 11, DoT and DoH were introduced. DoT and DoH are supported natively by installation of profiles (through mobileconfig files opened in <em>Safari</em>).
+  After installation, the encrypted DNS server can be selected in <em>Settings &rarr; General &rarr; VPN and Network &rarr; DNS</em>.
+</p>
+
+<ul>
+  <li><strong>Signed profiles</strong> are offered by <a href="https://adguard.com/en/blog/encrypted-dns-ios-14.html">AdGuard</a> and <a href="https://apple.nextdns.io/">NextDNS</a>.</li>
+  <li>User contributed <strong>unsigned profiles</strong> for several DNS providers are hosted by <a href="https://encrypted-dns.party/">encrypted-dns.party</a>.</li>
+</ul>
+
 <h2 id="dns-definitions" class="anchor">
-	<a href="#dns-definitions">
-		<i class="fas fa-link anchor-icon"></i>
-	</a> Definitions
+  <a href="#dns-definitions">
+    <i class="fas fa-link anchor-icon"></i>
+  </a> Definitions
 </h2>

 <h4>DNS-over-TLS (DoT)</h4>
--- a/_includes/sections/email-clients.html
+++ b/_includes/sections/email-clients.html
@ -1,51 +1,99 @@
-<h1 id="clients" class="anchor"><a href="#clients"><i class="fas fa-link anchor-icon"></i></a> Email Clients</h1>
+<h1 id="desktopclients" class="anchor"><a href="#desktopclients"><i class="fas fa-link anchor-icon"></i></a> Desktop Email Clients</h1>

 {% include cardv2.html
  title="Thunderbird"
  image="/assets/img/svg/3rd-party/thunderbird.svg"
  description="Thunderbird is a free, open source, cross-platform email, newsgroup, news feed, and chat (XMPP, IRC, Twitter) client developed by the Thunderbird community, and previously by the Mozilla Foundation."
  website="https://www.thunderbird.net/"
-  privacy-policy="https://www.mozilla.org/en-US/privacy/thunderbird/"
+  privacy-policy="https://www.mozilla.org/privacy/thunderbird/"
  forum="https://forum.privacytools.io/t/discussion-thunderbird/659"
  source="https://hg.mozilla.org/comm-central/"
-  windows="https://www.thunderbird.net/en-US/"
-  mac="https://www.thunderbird.net/en-US/"
-  linux="https://www.thunderbird.net/en-US/"
+  windows="https://www.thunderbird.net"
+  mac="https://www.thunderbird.net"
+  linux="https://www.thunderbird.net/"
  freebsd="https://www.freshports.org/mail/thunderbird/"
  openbsd="http://openports.se/mail/mozilla-thunderbird"
  netbsd="http://pkgsrc.se/mail/thunderbird"
 %}

 {% include cardv2.html
-  title="Claws Mail"
-  image="/assets/img/png/3rd-party/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."
-  website="https://www.claws-mail.org/"
-  forum="https://forum.privacytools.io/t/discussion-claws-mail/660"
-  git="https://git.claws-mail.org/"
-  windows="https://www.claws-mail.org/win32/"
-  mac="https://www.claws-mail.org/faq/index.php/Installation_and_Configuration#What_do_I_need_to_compile_Claws_Mail.3F"
-  linux="https://www.claws-mail.org/downloads.php?section=downloads"
-  freebsd="https://www.freshports.org/mail/claws-mail/"
-  openbsd="http://openports.se/mail/claws-mail"
-  netbsd="http://pkgsrc.se/mail/claws-mail"
+  title="Mailpile"
+  image="/assets/img/svg/3rd-party/mailpile.svg"
+  description="Mailpile is a free, community funded, open source email client with user-friendly encryption and privacy features."
+  website="https://www.mailpile.is/"
+  privacy-policy="https://www.mailpile.is/privacy.html"
+  tor="clgs64523yi2bkhz.onion"
+  forum="https://forum.privacytools.io/t/"
+  github="https://github.com/mailpile/Mailpile"
+  linux="https://www.mailpile.is/download/linux.html"
 %}

-
-<h3>Privacy Email Tools</h3>
-
-<ul>
-  <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.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://www.emailprivacytester.com/">Email Privacy Tester</a> - This tool will send an Email to your address and perform privacy-related tests.</li>
-</ul>
+{% include cardv2.html
+  title="Mailvelope"
+  image="/assets/img/svg/3rd-party/mailvelope.svg"
+  description="Mailvelope is a browser extension that enables the exchange of encrypted emails following the OpenPGP encryption standard."
+  website="https://www.mailvelope.com/en"
+  privacy-policy="https://www.mailvelope.com/en/privacy-policy"
+  forum="https://forum.privacytools.io/t/"
+  github="https://github.com/mailvelope/mailvelope"
+  firefox="https://addons.mozilla.org/firefox/addon/mailvelope/"
+  chrome="https://chrome.google.com/webstore/detail/mailvelope/kajibbejlbohfaggdiogboambcijhkke?hl"
+  edge="https://microsoftedge.microsoft.com/addons/detail/mailvelope/dgcbddhdhjppfdfjpciagmmibadmoapc"
+%}

 <h3>Worth Mentioning</h3>

 <ul>
-  <li><a href="https://github.com/k9mail/k-9/releases">K-9 Mail</a> - An independent mail application for Android. It supports both POP3 and IMAP mailboxes, but only supports push mail for IMAP.</li>
-  <li><a href="https://www.gnupg.org/">GNU Privacy Guard</a> - Email Encryption. GnuPG is a GPL Licensed alternative to the PGP suite of cryptographic software. <a href="https://theprivacyguide.org/tutorials/gpg.html">Tutorial.</a> Use <a href="https://gpgtools.org/">GPGTools for macOS.</a></li>
-  <li><a href="https://www.mailpile.is/">Mailpile (Beta)</a> - A modern, fast web-mail client with user-friendly encryption and privacy features.</li>
+  <li><a href="https://neomutt.org/">NeoMutt</a> - NeoMutt is an open-source command line mail reader (or MUA) for Linux and BSD. It’s a fork of <a href="https://en.wikipedia.org/wiki/Mutt_(email_client)">Mutt</a> with added features.
 </ul>
+
+
+
+<h1 id="mobileclients" class="anchor"><a href="#mobileclients"><i class="fas fa-link anchor-icon"></i></a> Mobile Email Clients</h1>
+
+<h2 id="adroidclients" class="anchor"><a href="#adroidclients"><i class="fas fa-link anchor-icon"></i></a> Android Email Clients</h1>
+
+{% include cardv2.html
+  title="FairEmail"
+  image="/assets/img/svg/3rd-party/fairemail.svg"
+  description="FairEmail is a minimal, open source email app, using open standards (IMAP, SMTP, OpenPGP) with a low data and battery usage."
+  website="https://email.faircode.eu/"
+  privacy-policy="https://github.com/M66B/FairEmail/blob/master/PRIVACY.md"
+  forum="https://forum.privacytools.io/t/"
+  github="https://github.com/M66B/FairEmail"
+  fdroid="https://f-droid.org/en/packages/eu.faircode.email/"
+  googleplay="https://play.google.com/store/apps/details?id=eu.faircode.email"
+%}
+
+{% include cardv2.html
+  title="K-9 Mail"
+  image="/assets/img/svg/3rd-party/k9mail.svg"
+  description="K-9 Mail is an independent mail application that supports both POP3 and IMAP mailboxes, but only supports push mail for IMAP."
+  website="https://k9mail.app/"
+  privacy-policy="https://k9mail.app/privacy"
+  forum="https://forum.privacytools.io/t/"
+  github="https://github.com/k9mail"
+  fdroid="https://f-droid.org/packages/com.fsck.k9/"
+  googleplay="https://play.google.com/store/apps/details?id=com.fsck.k9"
+%}
+
+<h2 id="iosclients" class="anchor"><a href="#iosclients"><i class="fas fa-link anchor-icon"></i></a> iOS Email Clients</h1>
+
+{% include cardv2.html
+  title="Canary Mail"
+  image="/assets/img/svg/3rd-party/canarymail.svg"
+  labels="color==warning::link==https://canarymail.io/faq.html::text==Closed source::tooltip==The source programming code for Canary Mail is not available. Canary Mail is a proprietary application."
+  description="Canary Mail is a paid email client designed to make end-to-end encryption seamless with security features such as a biometric app lock."
+  website="https://canarymail.io/"
+  privacy-policy="https://canarymail.io/privacy.html"
+  forum="https://forum.privacytools.io/t/"
+  ios="https://apps.apple.com/us/app/canary-mail/id1236045954"
+%}
+
+
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li><a href="https://letterbox-app.org/">Letterbox</a> - Letterbox is a free open-source mail client for iOS made as a part of an ongoing research project at the Freie Universität Berlin, Germany.</li>
+</ul>
+
--- a/_includes/sections/email-providers.html
+++ b/_includes/sections/email-providers.html
@ -37,8 +37,8 @@
    <p>ProtonMail has <a href="https://protonmail.com/support/knowledge-base/how-to-use-pgp">integrated OpenPGP encryption</a> in their webmail. Emails to other ProtonMail users are encrypted automatically, and encryption to non-ProtonMail users with an OpenPGP key can be enabled easily in your account settings. They also allow you to <a href="https://protonmail.com/support/knowledge-base/encrypt-for-outside-users">encrypt messages to non-ProtonMail users</a> without the need for them to sign up for a ProtonMail account or use software like OpenPGP.</p>
    <p>ProtonMail also supports the discovery of public keys via HTTP from their <a href="https://wiki.gnupg.org/WKD">Web Key Directory (WKD)</a>. This allows users outside of ProtonMail to find the OpenPGP keys of ProtonMail users easily, for cross-provider E2EE.</p>

-    <h5>{% include badge.html color="success" text=".onion Service" %}</h5>
-    <p>ProtonMail is accessible via Tor at <a href="https://protonirockerxow.onion/">protonirockerxow.onion</a>.</p>
+    <h5>{% include badge.html color="warning" text=".onion Service" %}</h5>
+    <p>ProtonMail's login and services are accessible over Tor, <a href="https://protonmailrmez3lotccipshtkleegetolb73fuirgj7r4o4vfu7ozyd.onion/">protonmailrmez3lotccipshtkleegetolb73fuirgj7r4o4vfu7ozyd.onion</a></p>

    <h5>{% include badge.html color="info" text="Extra Functionality" %}</h5>
    <p>ProtonMail offers a "Visionary" account for €24/Month, which also enables access to ProtonVPN in addition to providing multiple accounts, domains, aliases, and extra storage.</p>
--- a/_includes/sections/file-encryption.html
+++ b/_includes/sections/file-encryption.html
@ -55,21 +55,17 @@
 <h3>Worth Mentioning</h3>

 <ul>
-  <li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration.
-    {% include badge.html
-    color="warning"
-    icon="fas fa-exclamation-triangle"
-    link="https://github.com/cryptomator/cryptomator-android/issues/1#issuecomment-257979375"
-    tooltip="Cryptomator's mobile apps are not open-source."
-    %}</li>
+  <li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration.</li>
  <li><a href="https://gitlab.com/cryptsetup/cryptsetup/">Linux Unified Key Setup (LUKS)</a> - A full disk encryption system for Linux using dm-crypt as the disk encryption backend. Included by default in Ubuntu. Available for Windows and Linux.</li>
  <li><a href="https://www.dyne.org/software/tomb/">Tomb</a> - A simple zsh script for making LUKS containers on the commandline.</li>
  <li><a href="https://hat.sh/">Hat.sh</a> - A cross-platform, serverless JavaScript web application that provides secure file encryption using the AES-256-GCM algorithm in your browser. It can also be downloaded and run offline.</li>
-  <li><a href="https://www.keka.io/">Keka</a> - A macOS-only, file archiver with the ability to encrypt files.
-    {% include badge.html
-    color="warning"
-    icon="fas fa-exclamation-triangle"
-    link="https://github.com/aonez/Keka#so-where-is-the-source-code"
-    tooltip="This software is no longer open source."
-    %}</li>
+    <li>
+      <a href="https://www.kryptor.co.uk/">Kryptor</a> - Free and open source file encryption software for Windows, macOS, and Linux.
+      {% include badge.html
+        color="warning"
+        icon="fas fa-exclamation-triangle"
+        text="Beta"
+        tooltip="As Kryptor is still in beta, it may not be stable."
+      %}
+    </li>
 </ul>
--- a/_includes/sections/header.html
+++ b/_includes/sections/header.html
@ -10,7 +10,7 @@
  <p class="lead">You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities. {{ site.name }} provides services, tools and knowledge to protect your privacy against global mass surveillance.</p>
 </div>

-<form method="POST" action="https://search.privacytools.io/" id="search_form" role="search">
+<form method="POST" action="https://search.privacytools.io/searx/" id="search_form" role="search">
 <div class="input-group col-12 col-md-8 offset-md-2">
 <input type="search" name="q" class="form-control input-lg" id="q" placeholder="Try {{ site.name }} Search, a Privacy-Respecting Search Engine" autocomplete="off" value="">
 <span class="input-group-btn">
--- a/_includes/sections/hosting-provider.html
+++ b/_includes/sections/hosting-provider.html
@ -14,7 +14,7 @@
  title="VPS & Domain: Njalla"
  image="/assets/img/svg/3rd-party/njalla.svg"
  image-dark="/assets/img/svg/3rd-party/njalla-dark.svg"
-  description="Njalla is a privacy-aware domain registration service and VPS provider based in Nevis (with VPS data centers in Sweden). It is created by people from The Pirate Bay and IPredator VPN. Accepted payments: Bitcoin, Litecoin, Monero, Zcash, DASH, Bitcoin Cash and PayPal."
+  description="Njalla is a privacy-aware domain registration service and VPS provider based in Nevis (with VPS data centers in Sweden). It is created by people from The Pirate Bay and the now merged IPredator VPN. Accepted payments: Bitcoin, Litecoin, Monero, Zcash, DASH, Ethereum, Bitcoin Cash and PayPal."
  website="https://njal.la/"
  labels="color==warning::link==https://github.com/privacytools/privacytools.io/issues/1920::text==Warning::tooltip==Njalla blocks port 25 traffic."
  tor="http://njalladnspotetti.onion"
--- a/_includes/sections/instant-messenger.html
+++ b/_includes/sections/instant-messenger.html
@ -73,7 +73,7 @@
  include cardv2.html
  title="Element"
  image="/assets/img/svg/3rd-party/element.svg"
-  description='<a href="https://element.io">Element</a> (formerly <a href="https://element.io/blog/welcome-to-element/">Riot</a>) is the reference client for the <a href="https://matrix.org/docs/guides/introduction">Matrix</a> network. The <a href="https://matrix.org/docs/spec">Matrix open standard</a> is an open-source standard for secure, decentralized, real-time communication.'
+  description='<a href="https://element.io">Element</a> (formerly <a href="https://element.io/blog/welcome-to-element/">Riot</a>) is the reference client for the <a href="https://matrix.org/docs/guides/introduction">Matrix</a> network. The <a href="https://matrix.org/docs/spec">Matrix open standard</a> is an open-source standard for secure (<a href="https://matrix.org/blog/2016/11/21/matrixs-olm-end-to-end-encryption-security-assessment-released-and-implemented-cross-platform-on-riot-at-last">audit</a>), decentralized, real-time communication.'
  labels="text==VoIP"
  website="https://element.io"
  privacy-policy="https://element.io/privacy"
--- a/_includes/sections/ios-addons.html
+++ b/_includes/sections/ios-addons.html
@ -0,0 +1,31 @@
+<h1 id="iaddons" class="anchor"><a href="#iaddons"><i class="fas fa-link anchor-icon"></i></a> iOS Privacy Add-ons</h1>
+
+<div class="container-fluid">
+
+  <div class="row mb-2">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
+      <img src="/assets/img/png/3rd-party/passepartout.png" height="70" width="70" class="img-fluid d-block mr-auto ml-auto align-middle" alt="Passepartout">
+    </div>
+    <div class="col">
+    <h3>Use a VPN with <a href="https://passepartoutvpn.app">Passepartout</a></h3>
+    <p><strong>Passepartout</strong> is a free, <a href="https://github.com/passepartoutvpn">open-source</a>, and user friendly OpenVPN app with presets for multiple providers (including Mullvad and ProtonVPN, two <a href="https://www.privacytools.io/providers/vpn/#vpn">PrivacyTools recommended providers</a>) and easy configurability.</p>
+    </div>
+  </div>
+
+  <div class="row mb-2">
+    <div class="col-lg-3 col-sm-12 pt-lg-5">
+      <img src="/assets/img/png/3rd-party/adguard.png" height="70" width="70" class="img-fluid d-block mr-auto ml-auto align-middle" alt="AdGuard">
+    </div>
+    <div class="col">
+    <h3>Block content in Safari with <a href="https://adguard.com/en/adguard-ios/overview.html">AdGuard for iOS</a></h3>
+    <p><strong>AdGuard for iOS</strong> is a free (and <a href="https://github.com/AdguardTeam/AdguardForiOS">open-source</a>) content-blocking app that allows you to set filters within Safari. As required by iOS, it uses the native <a href="https://developer.apple.com/documentation/safariservices/creating_a_content_blocker">Content Blocker API</a> for even greater privacy.</p>
+    </div>
+  </div>
+
+<h2>See also</h2>
+
+<ul>
+  <li>
+    <a href="/providers/dns#dns-ios-clients">Our DNS client recommendations</a>, which have information on enabling encrypted DNS on iOS.
+  </li>
+</ul>
--- a/_includes/sections/notebooks.html
+++ b/_includes/sections/notebooks.html
@ -63,6 +63,7 @@
 <h3>Worth Mentioning</h3>

 <ul>
+  <li><a href="https://www.etesync.com/">EteSync</a> - Secure, end-to-end encrypted, and privacy respecting sync for your contacts, calendars, tasks and notes.</li>
  <li><a href="https://paperwork.cloud/">Paperwork</a> - An 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>
--- a/_includes/sections/operating-systems.html
+++ b/_includes/sections/operating-systems.html
@ -45,7 +45,7 @@
  image="/assets/img/svg/3rd-party/archlinux.svg"
  description='A simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement.'
  badges="info:Linux"
-  labels="color==success::link==https://tests.reproducible-builds.org/archlinux/archlinux.html::text==Reproducible builds"
+  labels="color==success::link==https://reproducible.archlinux.org::text==Reproducible builds"
  website="https://www.archlinux.org/"
  privacy-policy="https://wiki.archlinux.org/index.php/ArchWiki:Privacy_policy"
  gitlab="https://gitlab.archlinux.org"
--- a/_includes/sections/privacy-resources.html
+++ b/_includes/sections/privacy-resources.html
@ -15,7 +15,6 @@

 <ul>
  <li><a href="https://freedom.press/"><strong>Freedom of the Press Foundation</strong></a> - Supporting and defending journalism dedicated to transparency and accountability since 2012.</li>
-  <li><a href="https://www.erfahrungen.com/mit/anonymisierung/t/"><strong>Erfahrungen.com</strong></a> - German review aggregator website of privacy-related services.</li>
  <li><a href="https://openwireless.org/"><strong>Open Wireless Movement</strong></a> - a coalition of Internet freedom advocates, companies, organizations, and technologists working to develop new wireless technologies and to inspire a movement of Internet openness.</li>
  <li><a href="https://privacy.net/us-government-surveillance-spying-data"><strong>privacy.net</strong></a> - What does the US government know about you?</li>
  <li><a href="https://www.reddit.com/r/privacytoolsIO/wiki/index"><strong>r/privacytoolsIO Wiki</strong></a> - Our Wiki on reddit.com.</li>
--- a/_includes/sections/productivity-tools.html
+++ b/_includes/sections/productivity-tools.html
@ -38,7 +38,7 @@
  website="https://write.as/"
  privacy-policy="https://write.as/privacy"
  forum="https://forum.privacytools.io/t/discussion-write-as-productivity-tools/1539"
-  tor="http://writeas7pm7rcdqg.onion"
+  tor="http://writeasw4b635r4o3vec6mu45s47ohfyro5vayzx2zjwod4pjswyovyd.onion"
  git="https://code.as/writeas"
  web="https://write.as/pad"
  windows="https://github.com/writeas/writeas-cli"
--- a/_includes/sections/video-frontends.html
+++ b/_includes/sections/video-frontends.html
@ -8,7 +8,8 @@
  title="Invidious"
  image="/assets/img/svg/3rd-party/invidious.svg"
  description='Invidious is an alternative front-end to YouTube. It is free software, with no advertising or Javascript dependency to play videos, with lots of other features that allow you to have a complete YouTube experience, sans Google.'
-  website="https://invidio.us"
-  github="https://github.com/omarroth/invidious"
-  web="https://instances.invidio.us"
+  labels="color==warning::icon==fas fa-exclamation-triangle::link==https://github.com/iv-org/documentation/blob/master/Always-use-%22local%22-to-proxy-video-through-the-server-without-creating-an-account.md::text==Warning::tooltip==By default, Invidious will not proxy videos through the instance's proxy."
+  website="https://invidious.io/"
+  github="https://github.com/iv-org/invidious"
+  web="https://instances.invidious.io/"
 %}
--- a/_includes/sections/vpn.html
+++ b/_includes/sections/vpn.html
@ -44,7 +44,7 @@
    <h5>{% include badge.html color="success" text="Mobile Clients" %}</h5>
    <p>Mullvad has published <a href ="https://apps.apple.com/app/mullvad-vpn/id1488466513">App Store</a> and <a href="https://play.google.com/store/apps/details?id=net.mullvad.mullvadvpn">Google Play</a> clients, both supporting an easy-to use interface as opposed to requiring users to manual configure their WireGuard connections. The mobile client on Android is also available in <a href="https://f-droid.org/packages/net.mullvad.mullvadvpn">F-Droid</a>, which ensures that it is compiled with <a href="https://www.f-droid.org/en/2019/05/05/trust-privacy-and-free-software.html">reproducible builds</a>.</p></p>
    <h5>{% include badge.html color="info" text="Extra Functionality" %}</h5>
-    <p>The Mullvad VPN clients have a built-in killswitch to block internet connections outside of the VPN. They also are able to automatically start on boot. The Mullvad website is also accessible via Tor at <a href="http://xcln5hkbriyklr6n.onion/">xcln5hkbriyklr6n.onion</a>.</p>
+    <p>The Mullvad VPN clients have a built-in killswitch to block internet connections outside of the VPN. They also are able to automatically start on boot. The Mullvad website is also accessible via Tor at <a href="o54hon2e2vj6c7m3aqqu6uyece65by3vgoxxhlqlsvkmacw6a7m7kiad.onion">o54hon2e2vj6c7m3aqqu6uyece65by3vgoxxhlqlsvkmacw6a7m7kiad.onion</a>.</p>
    </div>
  </div>
  <div class="row mb-2">
@ -86,7 +86,7 @@
      {% include badge.html color="info" text="Standard USD $60/y" %}
      {% include badge.html color="secondary" text="Pro USD $100/y" %}
    </h2>
-    <p><strong><a href="https://www.ivpn.net">IVPN.net</a></strong> is another premium VPN provider, and they have been in operation since <strong>2009</strong>. IVPN is based in <span class="flag-icon flag-icon-gi"></span> Gibraltar and offers a 3 day free trial.</p>
+    <p><strong><a href="https://www.ivpn.net">IVPN.net</a></strong> is another premium VPN provider, and they have been in operation since <strong>2009</strong>. IVPN is based in <span class="flag-icon flag-icon-gi"></span> Gibraltar.</p>
    <h5>{% include badge.html color="success" text="32 Countries" %}</h5>
    <p>IVPN has <a href="https://www.ivpn.net/server-locations">servers in 32 countries</a> at the time of writing this page. Picking a VPN provider with a server nearest to you will reduce latency of the network traffic you send. This is because of a shorter route (less hops) to the destination.</p>
    <p>We also think it's better for the security of the VPN provider's private keys if they use <a href="https://en.wikipedia.org/wiki/Dedicated_hosting_service">dedicated servers</a>, instead of cheaper shared solutions (with other customers) such as <a href="https://en.wikipedia.org/wiki/Virtual_private_server">virtual private servers</a>.</p>
--- a/_includes/sections/warrant-canary.html
+++ b/_includes/sections/warrant-canary.html
@ -7,10 +7,8 @@
 <h4>Warrant Canary Examples:</h4>

 <ol>
-  <li><a href="https://proxy.sh/canary">https://proxy.sh/canary</a></li>
  <li><a href="https://www.ivpn.net/resources/canary.txt">https://www.ivpn.net/resources/canary.txt</a></li>
  <li><a href="https://www.bolehvpn.net/canary.txt">https://www.bolehvpn.net/canary.txt</a></li>
-  <li><a href="https://www.ipredator.se/static/downloads/canary.txt">https://www.ipredator.se/static/downloads/canary.txt</a></li>
 </ol>

 <h4>Related Warrant Canary Information</h4>
--- a/assets/css/style.scss
+++ b/assets/css/style.scss
@ -406,3 +406,60 @@ input#nav-toggle,
  font-size: 0.875em;
  content: "\f186";
 }
+
+/* Vanilla CSS implementation for tooltip */
+[data-toggle="tooltip"] {
+  cursor: pointer;
+  position: relative;
+}
+
+[data-toggle="tooltip"]:hover {
+  z-index: 1337;
+}
+
+[data-toggle="tooltip"]:before,
+[data-toggle="tooltip"]:after {
+  opacity: 0;
+  transition: opacity 0.15s linear;
+  pointer-events: none;
+}
+
+[data-toggle="tooltip"]:before {
+  background-color: #000;
+  border-radius: 3px;
+  bottom: 150%;
+  content: attr(data-original-title);
+  color: #fff;
+  font-size: 14px;
+  font-weight: normal;
+  left: 50%;
+  line-height: 1.2;
+  margin-bottom: 5px;
+  margin-left: -100px;
+  padding: 7px;
+  position: absolute;
+  text-align: center;
+  white-space: break-spaces;
+  width: 200px;
+}
+
+/* Little arrow */
+[data-toggle="tooltip"]:after {
+  border-style: solid;
+  border-left-color: transparent;
+  border-right-color: transparent;
+  border-top-color: #000;
+  border-width: 5px;
+  border-bottom: none;
+  bottom: 150%;
+  content: " ";
+  left: 50%;
+  margin-left: -5px;
+  position: absolute;
+  width: 0;
+}
+
+[data-toggle="tooltip"]:hover:before,
+[data-toggle="tooltip"]:hover:after {
+  opacity: .9;
+}
--- a/assets/img/png/3rd-party/adguard.png
+++ b/assets/img/png/3rd-party/adguard.png
--- a/assets/img/png/3rd-party/passepartout.png
+++ b/assets/img/png/3rd-party/passepartout.png
--- a/assets/img/svg/3rd-party/canarymail.svg
+++ b/assets/img/svg/3rd-party/canarymail.svg
--- a/assets/img/svg/3rd-party/fairemail.svg
+++ b/assets/img/svg/3rd-party/fairemail.svg
@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="color-1" x2="0" gradientUnits="userSpaceOnUse"><stop stop-opacity=".3" offset="0"/><stop stop-opacity="0" offset="1"/></linearGradient></defs><g transform="matrix(.7697 0 0 .7697 -1.5394 -1.5394)" font-family="none" font-size="none" font-weight="none" stroke-miterlimit="10" text-anchor="none" style="mix-blend-mode:normal"><path d="m7 43c-1.1046 0-2-0.89543-2-2v-34c0-1.1046 0.89543-2 2-2h34c1.1046 0 2 0.89543 2 2v34c0 1.1046-0.89543 2-2 2z" fill="#039be5"/><path d="m31.816 16.184h-15.632c-1.0796 0-1.9442 0.87442-1.9442 1.954l-0.0098 11.724c0 1.0796 0.87442 1.954 1.954 1.954h15.632c1.0796 0 1.954-0.87442 1.954-1.954v-11.724c0-1.0796-0.87442-1.954-1.954-1.954zm0 3.908-7.8161 4.885-7.8161-4.885v-1.954l7.8161 4.885 7.8161-4.885z" fill="none" stroke-width="0"/><path d="m33.77 18.138v11.724c0 1.0796-0.87442 1.954-1.954 1.954h-15.632c-1.0796 0-1.954-0.87442-1.954-1.954l0.0098-11.724c0-1.0796 0.86465-1.954 1.9442-1.954h15.632c1.0796 0 1.954 0.87442 1.954 1.954zm-1.954 0-7.8161 4.885-7.8161-4.885v1.954l7.8161 4.885 7.8161-4.885z" fill="#fff" stroke-width="0"/><g fill="none"><path d="m2 24c0-12.15 9.8497-22 22-22s22 9.8497 22 22-9.8497 22-22 22-22-9.8497-22-22z"/><rect x="2" y="2" width="44" height="22"/><path d="m2 24v-22h44v22z"/><path d="m2 24v-22h44v22z"/><path d="m2 24v-22h44v22z"/><path d="m2 24v-22h44v22z"/></g></g></svg>
--- a/assets/img/svg/3rd-party/invidious.svg
+++ b/assets/img/svg/3rd-party/invidious.svg
@ -1 +1,2 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 31 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><g><path d="M14,0.609c-3.927,0.345 -7.717,2.21 -10.235,5.037c-2.488,2.792 -3.765,6.08 -3.765,9.703c-0.005,2.361 0.507,4.479 1.581,6.566c0.74,1.439 1.555,2.544 2.736,3.719c0.871,0.867 1.338,1.252 2.336,1.916c2.102,1.403 4.585,2.29 7.114,2.538c0.815,0.081 2.573,0.071 3.374,-0.02c4.631,-0.532 8.69,-2.99 11.213,-6.8c1.55,-2.341 2.366,-5.041 2.366,-7.869c0,-1.358 -0.111,-2.27 -0.431,-3.541c-0.476,-1.916 -1.484,-3.942 -2.741,-5.528c-0.79,-0.993 -2.275,-2.356 -3.369,-3.096c-2.052,-1.378 -4.53,-2.295 -6.987,-2.579c-0.659,-0.076 -2.544,-0.106 -3.192,-0.046Zm2.406,0.705c2.671,0.197 5.128,1.028 7.271,2.457c0.892,0.593 1.388,1.003 2.209,1.824c1.596,1.586 2.625,3.207 3.365,5.295c0.263,0.75 0.567,2.022 0.663,2.812c0.097,0.76 0.087,2.701 -0.02,3.466c-0.517,3.698 -2.478,7.002 -5.533,9.302c-1.682,1.267 -3.628,2.154 -5.751,2.63c-1.763,0.39 -3.972,0.441 -5.826,0.127c-6.152,-1.039 -11.031,-5.863 -11.907,-11.776c-0.284,-1.91 -0.152,-4.058 0.354,-5.816c0.765,-2.635 2.164,-4.814 4.307,-6.719c2.868,-2.543 6.931,-3.891 10.868,-3.602Z" style="fill-rule:nonzero;"/><path d="M14.086,7.095c-0.629,0.329 -0.623,1.292 0.015,1.616c0.436,0.223 0.993,0.081 1.251,-0.314c0.294,-0.441 0.132,-1.069 -0.339,-1.307c-0.258,-0.132 -0.669,-0.132 -0.927,0.005Z" style="fill-rule:nonzero;"/><path d="M14.567,9.937c-0.061,0.081 -0.319,0.841 -0.517,1.536c-0.152,0.527 -0.511,1.773 -0.836,2.862c-0.101,0.35 -0.294,1.009 -0.43,1.47c-0.132,0.461 -0.325,1.119 -0.431,1.469c-0.101,0.35 -0.294,1.008 -0.431,1.469c-0.132,0.462 -0.324,1.12 -0.43,1.47c-0.102,0.349 -0.289,0.988 -0.411,1.419c-0.299,1.048 -0.471,1.514 -0.583,1.57c-0.05,0.031 -0.177,0.051 -0.283,0.051c-0.37,0 -0.426,0.04 -0.411,0.273l0.015,0.208l1.156,0.015l1.155,0.011l-0.015,-0.239l-0.015,-0.243l-0.37,-0.015c-0.335,-0.015 -0.375,-0.025 -0.426,-0.137c-0.066,-0.142 0,-0.527 0.188,-1.14c0.065,-0.208 0.238,-0.79 0.38,-1.292c0.141,-0.501 0.334,-1.165 0.43,-1.469c0.091,-0.309 0.284,-0.968 0.431,-1.47c0.142,-0.501 0.334,-1.165 0.431,-1.469c0.091,-0.309 0.283,-0.968 0.43,-1.469c0.431,-1.505 0.623,-2.123 0.664,-2.174c0.025,-0.025 0.086,0.056 0.142,0.177c0.051,0.122 0.973,1.992 2.042,4.15c1.069,2.159 2.265,4.57 2.65,5.361l0.704,1.429l0.851,0c0.466,0 0.851,-0.021 0.851,-0.041c0,-0.02 -0.38,-0.801 -0.841,-1.733c-2.979,-5.994 -4.909,-9.921 -5.234,-10.64c-0.147,-0.319 -0.349,-0.765 -0.451,-0.988c-0.223,-0.481 -0.293,-0.557 -0.405,-0.421Z" style="fill-rule:nonzero;"/></g></svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128" height="128" version="1.1" viewBox="0 0 33.866 33.867" xmlns="http://www.w3.org/2000/svg"><g transform="translate(-90 -194.05)"><rect x="90" y="194.05" width="33.866" height="33.867" fill="#575757" stroke-width=".0041683"/><path d="m106.35 224.21c-1.3091-0.0522-2.561-0.28153-3.7804-0.69251-4.0326-1.3592-7.1884-4.536-8.4002-8.4571-0.52223-1.6892-0.66553-3.568-0.41396-5.4282 0.24542-1.8149 0.89975-3.5397 1.9408-5.1158 0.79828-1.2086 1.9273-2.3995 3.1238-3.295 2.4401-1.8262 5.6846-2.8104 8.756-2.6561 1.7118 0.086 3.3031 0.44746 4.8355 1.0984 0.54203 0.23024 1.3245 0.64056 1.8319 0.96073 0.93591 0.59047 1.4794 1.0251 2.2807 1.8238 0.87667 0.87382 1.4636 1.6057 2.0106 2.5072 0.47677 0.78572 0.93255 1.7958 1.2057 2.672 0.1058 0.33935 0.2938 1.0884 0.37603 1.4983 0.15814 0.78823 0.17858 1.0399 0.17891 2.2034 4e-4 1.2246-0.0306 1.6148-0.19291 2.4313-0.61694 3.1034-2.3534 5.8316-4.9523 7.7811-1.509 1.1318-3.3089 1.9535-5.1954 2.3718-1.1055 0.24512-2.3429 0.34694-3.6047 0.29662zm-2.3216-5.2112c-2e-5 -0.0348-5e-3 -0.13601-0.0108-0.22488l-0.0107-0.16157-0.31099-0.0174c-0.26773-0.015-0.31727-0.0221-0.35616-0.0511-0.13384-0.0999-0.0971-0.40146 0.14878-1.2208 0.0571-0.19036 0.22073-0.7488 0.36357-1.241 0.14283-0.49216 0.34395-1.1797 0.44695-1.528 0.10299-0.34823 0.27745-0.94466 0.38769-1.3254 0.11024-0.38073 0.23908-0.82018 0.2863-0.97654 0.0472-0.15637 0.21551-0.73002 0.37399-1.2747 0.32725-1.1249 0.53991-1.8337 0.59158-1.9718 0.0343-0.0917 0.0362-0.0935 0.066-0.063 0.0169 0.0173 0.2544 0.48725 0.52786 1.0444 0.27348 0.55716 0.86576 1.7576 1.3161 2.6676 1.1369 2.2972 2.5035 5.0651 2.8614 5.7956l0.3 0.61228 0.75132-6e-3c0.41323-3e-3 0.76826-0.013 0.78903-0.0216 0.0371-0.0155 0.0358-0.0196-0.0908-0.28558-0.0706-0.14843-0.53865-1.098-1.04-2.1102-3.2203-6.5014-4.0493-8.1925-4.4904-9.1595-0.31102-0.68187-0.45659-0.97938-0.51022-1.0426-0.0549-0.0647-0.10794-0.0704-0.15679-0.0169-0.0793 0.0868-0.27149 0.6656-0.62088 1.8699-0.13605 0.46895-0.43239 1.4833-0.65853 2.254-0.43917 1.4968-0.56342 1.9206-0.94783 3.2333-0.13463 0.45967-0.31734 1.0827-0.40602 1.3844-0.0887 0.3018-0.26676 0.91344-0.3957 1.3592-0.28468 0.98401-0.40587 1.3817-0.48871 1.604-0.14135 0.37922-0.17015 0.41863-0.32553 0.4457-0.0588 0.0102-0.15942 0.0187-0.22366 0.0187-0.14547 2e-4 -0.23477 0.024-0.26827 0.0719-0.0279 0.0398-0.0373 0.32279-0.0121 0.36255 0.0136 0.0214 0.16319 0.0247 1.5438 0.0343l0.56982 4e-3 -5e-5 -0.0633zm2.4308-13.598c0.28629-0.0611 0.55962-0.32694 0.62422-0.60717 0.0242-0.10491 0.0215-0.32911-5e-3 -0.4286-0.0563-0.21042-0.21621-0.41611-0.39944-0.51377-0.25208-0.13435-0.62545-0.13423-0.87784 3.3e-4 -0.39572 0.21092-0.53944 0.73347-0.31669 1.1514 0.17856 0.335 0.55304 0.48783 0.97482 0.39785z" fill="#f0f0f0" stroke-width=".0016884"/><g transform="matrix(.0046229 0 0 -.0046229 92.927 225.44)"><path d="m2787 4669c-124-65-123-255 3-319 86-44 196-16 247 62 58 87 26 211-67 258-51 26-132 26-183-1z" fill="#00b6f0" stroke="#00b6f0" stroke-width="4.25"/><path d="m2882 4108c-12-16-63-166-102-303-30-104-101-350-165-565-20-69-58-199-85-290-26-91-64-221-85-290-20-69-58-199-85-290-26-91-64-221-85-290-20-69-57-195-81-280-59-207-93-299-115-310-10-6-35-10-56-10-73 0-84-8-81-54l3-41 228-3 228-2-3 47-3 48-73 3c-66 3-74 5-84 27-13 28 0 104 37 225 13 41 47 156 75 255s66 230 85 290c18 61 56 191 85 290 28 99 66 230 85 290 18 61 56 191 85 290 85 297 123 419 131 429 5 5 17-11 28-35 10-24 192-393 403-819s447-902 523-1058l139-282h168c92 0 168 4 168 8s-75 158-166 342c-588 1183-969 1958-1033 2100-29 63-69 151-89 195-44 95-58 110-80 83z" fill="#575757"/></g></g></svg>
--- a/assets/img/svg/3rd-party/k9mail.svg
+++ b/assets/img/svg/3rd-party/k9mail.svg
--- a/assets/img/svg/3rd-party/mailpile.svg
+++ b/assets/img/svg/3rd-party/mailpile.svg
@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(.66524 0 0 .66524 -.96517 4.1927)"><g fill="#3a6b8c"><polygon points="31.845 13.283 30.104 2.644 24.619 9.464 21.684 12.224 25.706 16.172 30.831 19.932 30.34 20.619 26.846 18.665 20.871 12.907 17.647 16.924 12.939 14.392 11.562 17.32 6.347 24.443 5.34 23.793 10.494 16.707 12.289 13.473 7.505 11.245 1.663 7.159 2.218 14.629 4.142 25.806 14.08 26.266 25.38 23.949 31.398 23.161 32.59 21.342"/><polygon points="8.158 4.18 1.451 5.672 8.049 9.999 13.166 12.295 17.285 15.103 19.747 12.096 23.805 8.276 29.932 1.152 17.013 2.814"/></g><g fill="#a31304"><polygon points="38.792 31.277 39.955 24.488 35.223 27.465 32.873 28.522 34.481 31.744 36.794 35.083 36.356 35.396 34.651 33.488 32.239 28.765 29.455 30.521 27.139 28.01 25.697 29.492 21.063 32.711 20.59 32.107 25.18 28.899 26.937 27.319 24.511 24.978 22.343 25.521 20.612 25.922 19.447 33.074 25.356 35.422 32.665 36.375 36.464 37.152 37.563 36.301"/><polygon points="40.162 23.551 33.186 22.152 32.029 23.9 28.28 24.32 26.385 24.489 25.48 24.721 27.711 26.791 29.617 29.346 31.729 28.041 34.976 26.578"/></g><path d="m49.834 2.655-7.384 1.315-7.405 1.542-2.728 0.433 1.311 7.074 1.35 6.243 4.976-1.134 7.71-1.351 4.696-1.044-1.01-4.363zm-4.591 11.343 0.073 0.423-2.605 0.403-5.568 1.019-0.08-0.463-0.113-0.472 2.204-0.486 0.03-5e-3 3.517-0.531 2.488-0.343zm-8.631-0.677-1e-3 -0.36 2.865-0.582 2.808-0.494 1.329-0.286 1.144-0.211 0.101 0.769-1.396 0.317-3.988 0.682-2.714 0.56zm7.806-3.594 0.095 0.434-2.764 0.534-2.992 0.457-2.437 0.434-0.219-0.808 5.709-1.049 2.569-0.423zm4.722-3.305-2.325 0.365-0.326-1.106-0.15-1.333 1.068-0.134 1.336-0.275 0.319 1.245z" fill="#4b7945"/></g></svg>
--- a/assets/img/svg/3rd-party/mailvelope.svg
+++ b/assets/img/svg/3rd-party/mailvelope.svg
@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(4 0 0 4 -201.36 -187.41)" fill-rule="evenodd" stroke-width=".26458"><circle cx="54.572" cy="51.087" r="4.2333" fill="#ff004f"/><path d="m54.571 54.438c-0.89694 0-1.7383-0.34687-2.3693-0.97658-0.63156-0.6305-0.98002-1.4729-0.98081-2.3723a3.3412 3.3412 0 0 1 0.15663-1.0149l0.0018-0.0074c0.02302-0.08096 0.05133-0.15875 0.08414-0.23151 0.0058-0.01455 0.01243-0.03069 0.01931-0.04657 0.0291-0.06641 0.1442-0.29501 0.42016-0.46831 0.2495-0.1569 0.46831-0.17039 0.49371-0.17145 0.06032-0.0071 0.12277-0.01058 0.18494-0.01058 0.2831 0 0.53314 0.11192 0.70432 0.31591 0.13018 0.15531 0.20108 0.34581 0.20638 0.55483a1.1433 1.1433 0 0 1 0.51832-0.12726c0.2831 0 0.5334 0.11218 0.70432 0.31591 0.01032 0.01217 0.02011 0.02487 0.0299 0.03757 0.22728-0.22542 0.52731-0.35348 0.83079-0.35348 0.2831 0 0.53314 0.11218 0.70432 0.31591 0.17357 0.2069 0.24156 0.4789 0.19103 0.76544l-0.1778 1.0073c-0.02381 0.13573 0.0045 0.25982 0.07964 0.34952 0.0725 0.08652 0.18415 0.13414 0.31406 0.13414 0.39211 0 0.52996-0.28575 0.62045-0.59425 0.07752-0.27332 0.11324-0.55748 0.1061-0.84429a2.8244 2.8244 0 0 0-0.85169-1.9545 2.8265 2.8265 0 0 0-1.9698-0.8165h-0.01958c-0.56621 0-1.1136 0.16669-1.5827 0.48286a0.25665 0.25665 0 0 1-0.14393 0.04419 0.25347 0.25347 0 0 1-0.19288-0.08864l-0.0013-0.0016a0.254 0.254 0 0 1 0.05186-0.37518 3.3298 3.3298 0 0 1 1.936-0.57044 3.3348 3.3348 0 0 1 2.2886 0.97102 3.334 3.334 0 0 1 0.9943 2.2786 3.3507 3.3507 0 0 1-0.10848 0.95409h2.64e-4l-0.01138 0.0418-5e-3 0.01667a3.3258 3.3258 0 0 1-0.10583 0.31406c-0.0209 0.04948-0.13705 0.30242-0.42307 0.48207-0.24738 0.15558-0.44265 0.16351-0.46567 0.16404a1.2938 1.2938 0 0 1-0.11615 0.0053c-0.2831 0-0.5334-0.11218-0.70432-0.31591-0.17357-0.20717-0.24156-0.47889-0.19103-0.76544l0.1778-1.0075c0.02381-0.13547-0.0045-0.25982-0.07964-0.34925-0.0725-0.08652-0.18415-0.13414-0.31406-0.13414-0.3085 0-0.61516 0.26194-0.66966 0.57203l-0.19447 1.0578a0.1397 0.1397 0 0 1-0.13758 0.1143h-0.23363a0.13944 0.13944 0 0 1-0.13758-0.16484l0.20161-1.0964c0.02381-0.13494-0.0045-0.25929-0.07937-0.34899-0.07276-0.08625-0.18442-0.13388-0.31432-0.13388-0.30824 0-0.61489 0.26194-0.66966 0.57203l-0.1942 1.0578a0.1397 0.1397 0 0 1-0.13758 0.1143h-0.23336a0.13917 0.13917 0 0 1-0.13758-0.16484l0.20214-1.1004 0.13547-0.74057c0.02381-0.13467-0.0048-0.25823-0.0799-0.34793-0.0725-0.08652-0.18415-0.13414-0.31406-0.13414-0.32015 0-0.52626 0.12303-0.64929 0.38708a2.821 2.821 0 0 0-0.19976 1.1663c0.02858 0.72416 0.33496 1.4057 0.86254 1.9188 0.52784 0.51303 1.2179 0.8001 1.9428 0.80883h0.03413c0.59955 0 1.1734-0.18521 1.6595-0.53605a0.24924 0.24924 0 0 1 0.14684-0.04763 0.25453 0.25453 0 0 1 0.14949 0.46117 3.3261 3.3261 0 0 1-1.9571 0.63209" fill="#fff2f6"/></g></svg>
--- a/assets/js/bootstrap.min.js
+++ b/assets/js/bootstrap.min.js
--- a/assets/js/jquery-3.3.1.min.js
+++ b/assets/js/jquery-3.3.1.min.js
--- a/assets/js/main.js
+++ b/assets/js/main.js
@ -1,6 +1,3 @@
-$(function() {
-  $("[data-toggle='tooltip']").tooltip();
-});
 document.querySelectorAll(".onclick-select").forEach(element => {
  element.addEventListener("click", element.select);
 });
--- a/assets/js/popper.min.js
+++ b/assets/js/popper.min.js
--- a/assets/js/redirects.js
+++ b/assets/js/redirects.js
@ -29,5 +29,6 @@ if (window.location == 'https://www.privacytools.io/#os') {	window.location = 'h
 if (window.location == 'https://www.privacytools.io/#live_os') {	window.location = 'https://www.privacytools.io/operating-systems/#live_os';}
 if (window.location == 'https://www.privacytools.io/#mobile_os') {	window.location = 'https://www.privacytools.io/operating-systems/#mobile_os';}
 if (window.location == 'https://www.privacytools.io/#aaddons') {	window.location = 'https://www.privacytools.io/operating-systems/#aaddons';}
+if (window.location == 'https://www.privacytools.io/#iaddons') {	window.location = 'https://www.privacytools.io/operating-systems/#iaddons';}
 if (window.location == 'https://www.privacytools.io/#firmware') {	window.location = 'https://www.privacytools.io/operating-systems/#firmware';}
 if (window.location == 'https://www.privacytools.io/#win10') {	window.location = 'https://www.privacytools.io/operating-systems/#win10';}
--- a/nginx/010-headers.conf
+++ b/nginx/010-headers.conf
@ -8,4 +8,4 @@ add_header Alt-Svc 'h2="privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd
 add_header Onion-Location http://www.privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd.onion$request_uri always;
 add_header Expect-CT 'max-age=86400, enforce';
 add_header Referrer-Policy "strict-origin";
-add_header Feature-Policy "geolocation none;midi none;notifications none;push none;sync-xhr none;microphone none;camera none;magnetometer none;gyroscope none;speaker self;vibrate none;fullscreen self;payment none;";
+add_header Permissions-Policy "accelerometer=(),ambient-light-sensor=(),geolocation=(),midi=(),sync-xhr=(),microphone=(),camera=(),magnetometer=(),gyroscope=(),fullscreen=(self),payment=()";
--- a/pages/about/about.html
+++ b/pages/about/about.html
@ -161,7 +161,7 @@ emeritus=true
    <p><a href="https://github.com/privacytools/privacytools.io/issues"><i class="fab fa-github fa-lg fa-fw"></i> Open an issue on GitHub</a></p>
    <p><a href="https://www.reddit.com/r/privacytoolsIO/"><i class="fab fa-reddit fa-lg fa-fw"></i> Suggest something new on our subreddit</a></p>
    <p>For complete transparency, software and providers will only be considered for this website after discussions take place on our GitHub issue tracker. We of course don't make any changes in secret.</p>
-    <p>Join our Matrix room at <code>#general:privacytools.io</code> 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 (<code>https://chat.privacytools.io</code>) using <a href="https://riot.privacytools.io">Riot</a>.</p>
+    <p>Join our Matrix rooms at <code>#lounge:privacytools.io</code> to chat with us and other members, and <code>#privacy:privacytools.io</code> for privacy discussions in general! If you need a Matrix account, you can sign up with our own homeserver (<code>https://chat.privacytools.io</code>) using <a href="https://element.privacytools.io">Element</a>.</p>
    <p>You can also email the team at <a itemprop="email" href="mailto:support@privacytools.io">support@privacytools.io</a> and find us on <a itemprop="sameAs" href="https://twitter.com/privacytoolsIO">Twitter</a> and <a itemprop="sameAs" href="https://social.privacytools.io/@privacytools">Mastodon</a>.</p>
    <link itemprop="sameAs" href="https://blog.privacytools.io">
    <link itemprop="sameAs" href="https://www.youtube.com/channel/UCen3taxHtzByXV8Da73B1Vg">
--- a/pages/about/librejs.html
+++ b/pages/about/librejs.html
@ -2,7 +2,7 @@
 permalink: /about/javascript/
 ---
 <h3>JavaScript Licenses</h3>
-<table id="jslicense-labels1" border="1">
+<table border="1" id="jslicense-labels1">
  <tr>
    <td><a href="/assets/js/main.js">main.js</a></td>
    <td><a href="https://github.com/privacytools/privacytools.io/raw/master/LICENSE.txt">CC0-1.0-only</a></td>
@ -17,15 +17,11 @@ permalink: /about/javascript/
  </tr>
  <tr>
    <td><a href="/assets/js/bootstrap.min.js">bootstrap.min.js</a></td>
-    <td><a href="https://github.com/twbs/bootstrap/raw/master/LICENSE">Expat</a></td>
-  </tr>
-  <tr>
-    <td><a href="/assets/js/jquery-3.3.1.min.js">jquery-3.3.1.min.js</a></td>
-    <td><a href="https://github.com/jquery/jquery/raw/master/LICENSE.txt">Expat</a></td>
+    <td><a href="https://github.com/twbs/bootstrap/raw/main/LICENSE">Expat</a></td>
  </tr>
  <tr>
    <td><a href="/assets/js/popper.min.js">popper.min.js</a></td>
-    <td><a href="https://github.com/FezVrasta/popper.js/raw/master/LICENSE.md">Expat</a></td>
+    <td><a href="https://github.com/popperjs/popper-core/raw/master/LICENSE.md">Expat</a></td>
  </tr>
  <tr>
    <td><a href="/assets/js/sortable.min.js">sortable.min.js</a></td>
--- a/pages/notices.md
+++ b/pages/notices.md
@ -28,7 +28,6 @@ In certain jurisdictions, namely those in which the copyright waiver in the CC0-
 Code, including source files and code samples if any in the content, is released under CC-1.0, with the following exceptions:

 - Bootstrap code is under the MIT license. See: [github.com/twbs/bootstrap/blob/master/LICENSE](https://github.com/twbs/bootstrap/blob/master/LICENSE)
- [jQuery](https://github.com/privacytools/privacytools.io/blob/master/assets/js/jquery-3.3.1.min.js) is under the MIT license. See: [jquery.org/license](https://jquery.org/license/)
 - [Popper.js](https://github.com/privacytools/privacytools.io/blob/master/assets/js/popper.min.js) is under the MIT license. See: [github.com/FezVrasta/popper.js/raw/master/LICENSE.md](https://github.com/FezVrasta/popper.js/raw/master/LICENSE.md)
 - [Sortable](https://github.com/privacytools/privacytools.io/blob/master/assets/js/sortable.min.js) is under the MIT license. See: [github.com/HubSpot/sortable/raw/master/LICENSE](https://github.com/HubSpot/sortable/raw/master/LICENSE)
 - The Font Awesome icons are under CC-BY-4.0, Font Awesome fonts are under SIL OFL 1.1, and Font Awesome code is under the MIT License. See: [fontawesome.com/license/free](https://fontawesome.com/license/free)
--- a/pages/os.html
+++ b/pages/os.html
@ -19,6 +19,8 @@ description: "Even your own computer could be compromising your privacy. Discove

 {% include sections/android-addons.html %}

+{% include sections/ios-addons.html %}
+
 {% include sections/other-mobile-operating-systems.html %}

 {% include sections/router-firmware.html %}
--- a/pages/providers/vpn.html
+++ b/pages/providers/vpn.html
@ -221,11 +221,9 @@ breadcrumb: "VPN"
        <h3>Related VPN information</h3>

        <ul>
-          <li><a href="https://thatoneprivacysite.net/vpn-comparison-chart/">Spreadsheet with unbiased, independently verifiable data on over 100 VPN services.</a></li>
          <li><a href="https://blog.privacytools.io/the-trouble-with-vpn-and-privacy-reviews/">The Trouble with VPN and Privacy Review Sites</a></li>
          <li><a href="https://vikingvpn.com/blogs/off-topic/beware-of-vpn-marketing-and-affiliate-programs">Beware of False Reviews - VPN Marketing and Affiliate Programs</a></li>
          <li><a href="https://torrentfreak.com/proxy-sh-vpn-provider-monitored-traffic-to-catch-hacker-130930/">Proxy.sh VPN Provider Sniffed Server Traffic to Catch Hacker</a></li>
-          <li><a href="https://proxy.sh/panel/knowledgebase.php?action=displayarticle&id=5">Ethical policy - All of the reasons why Proxy.sh might enable logging</a></li>
          <li><a href="https://www.ivpn.net/privacy">IVPN.net will collect your email and IP address after sign up</a><br />Read the <a data-toggle="tooltip" data-placement="top" data-original-title="The IP collected at signup is only used for a few seconds by our fraud module and then discarded, it is not stored. Storing them would significantly increase our own liability and certainly would not be in our interest. You're absolutely welcome to signup using Tor or a VPN.">Email statement</a> from IVPN.</li>
          <li><a href="https://medium.com/@blackVPN/no-logs-6d65d95a3016">blackVPN announced to delete connection logs after disconnection</a></li>
          <li><a href="https://gist.github.com/kennwhite/1f3bc4d889b02b35d8aa">Don't use LT2P IPSec, use other protocols.</a></li>
@ -277,6 +275,7 @@ breadcrumb: "VPN"
          <li><a href="https://www.comparitech.com/blog/vpn-privacy/ufo-vpn-data-exposure/">"Zero logs" VPN exposes millions of logs including user passwords, claims data is anonymous</a> July 2020 </li>
          <li><a href="https://www.zdnet.com/article/nordvpn-http-post-bug-exposed-sensitive-customer-information/">NordVPN HTTP POST bug exposed customer information, no authentication required</a> March 2020</li>
          <li><a href="https://www.theregister.com/2019/10/21/nordvpn_security_issue/">Row erupts over who to blame after NordVPN says: One of our servers was hacked via remote management tool</a> October 2019</li>
+          <li><a href="https://arstechnica.com/gadgets/2021/07/vpn-servers-seized-by-ukrainian-authorities-werent-encrypted/">VPN servers seized by Ukrainian authorities weren't encrypted and allowed authorities to impersonate Windscribe servers and capture and decrypt traffic passing through them</a> July 2021</li>
        </ul>
      </div>
    </div>
@ -286,7 +285,7 @@ breadcrumb: "VPN"
    <div class="row">
      <div class="col-lg-6 col-12">
      <h3>Related Videos</h3>
-        <a href="https://invidiou.site/watch?v=WVDQEoe6ZWY" target="_blank">
+        <a href="https://invidious.site/watch?v=WVDQEoe6ZWY" target="_blank">
          <img
            src="/assets/img/png/layout/this-video-is-sponsored-by-vpn.png"
            class="img-fluid float-left mr-3"
Author	SHA1	Message	Date
Daniel Nathan Gray	b8661944ee	PrivacyTools has become Privacy Guides (#2430 )	2022-06-24 23:24:44 +09:30
Freddy	e0b3358e4f	Remove NixNet DNS and LibreDNS (#2421 )	2021-09-12 13:53:44 +00:00
Vladimir Blagushin	b1bd705e6c	Update Invidious domain and logo (#2428 )	2021-09-12 13:51:51 +00:00
Freddy	211b76b9ad	Correcting Mullvad's onion link (#2397 )	2021-07-30 13:33:51 +00:00
Daniel Nathan Gray	b2b205760c	Mention Windscribe server incident (#2395 )	2021-07-29 03:51:54 +00:00
Stephen Karl Larroque	cf11365854	add audit for Element messenger (#2294 )	2021-07-29 03:46:11 +00:00
Gamma	159d9499d7	Update write.as to Onion v3 address (#2388 ) Announcement: https://discuss.write.as/t/tor-onion-service-moved/3188	2021-07-23 02:59:41 +00:00
Zackaryia Shamsi	b2f7f073c3	Update ProtonMail's onion address to v3 (#2377 )	2021-07-17 12:22:40 +00:00
Ophir LOJKINE	06982df16c	Fix spelling mistakes in the issue template (#2302 )	2021-05-24 04:56:34 +00:00
Daniel Nathan Gray	1cdd251824	Revert "Replace <b> tags to <strong> and <i> tags to <em> (#2273 )" (#2281 ) This reverts commit 216dd66aba35d64fff79e62ed317a7fa317bb8af.	2021-05-04 04:22:50 +00:00
Mikaela Suomalainen	7f387eb07a	DNS: mark Quad9 as Switzerland based (#2214 ) Resolves: #2212 https://quad9.net/news/blog/quad9-public-domain-name-service-moves-to-switzerland-for-maximum-internet-privacy-protection/	2021-05-04 03:50:26 +00:00
Pilou	d0531f06cf	LibreDNS doesn't support DNSSEC (#2216 )	2021-05-04 03:48:03 +00:00
Samuel Lucas	6b18243b02	file-encryption.html: Update Kryptor website URL. (#2224 )	2021-05-04 03:47:13 +00:00
L-M-H	e7cea2c685	Update 010-headers.conf (#2231 ) Changed from Feature-Policy to the new naming and buildup in Permissions-Policy	2021-05-04 03:46:24 +00:00
A-AhmedYasir	dda163a69e	Update librejs.html (#2271 ) Added 'id="jslicense-labels1"' attribute to the table element to fix the website not working with LibreJS. This resolves https://github.com/privacytools/privacytools.io/issues/2270	2021-05-04 03:37:43 +00:00
James Kerrane	37da7f1ef3	Remove dead links, update info about mentioned companies (#2235 )	2021-05-04 03:34:39 +00:00
J. C	216dd66aba	Replace <b> tags to <strong> and <i> tags to <em> (#2273 )	2021-05-04 03:33:03 +00:00
Sergey Musiyenko	e9d9e8fbf6	remove: www.erfahrungen.com (#2250 ) Looks like it was taken over, all I see is just a bunch of ads on this website	2021-05-04 03:25:05 +00:00
Freddy	0a2611fef1	Update Matrix Room Links (#2196 )	2021-05-04 03:24:12 +00:00
dependabot[bot]	5a130e2f8a	Bump nokogiri from 1.10.10 to 1.11.2 (#2243 )	2021-05-04 03:22:01 +00:00
dependabot[bot]	6393fc80bb	Bump rexml from 3.2.4 to 3.2.5 (#2275 )	2021-05-04 03:21:36 +00:00
Morten Linderud	cb5021dc7e	Arch Linux: Ensure correct link to reproducible builds (#2191 ) The CI system is a fuzzer for finding upstream and doesn't necessarily reflect the progress made in Arch. The CI are just checking out some files and builds them twice. The link moves this to our current rebuilder setup which reproduces distributed packages.	2021-04-14 15:28:03 -08:00
Jacob Neplokh	4650f5ded9	Add iOS Addons Section (#2075 ) - Add references to redirects, pages, and navigation - Add two addons/apps (Passepartout and AdGuard) - Add two images: the respective logos for those apps	2021-03-26 08:41:53 +00:00
Freddy	accb7ed98d	Uncensored DNS now supports DoH (#2181 )	2021-03-17 07:17:37 +00:00
IacobusKopiirefuto	9552a394b5	Onion Browser: link proving Tor Project endorsement (#2179 ) In the Onion Browser's description is written that it is endorsed by the Tor Project, but the Onion Browser's website has no easy to find link to the Tor Project's website to prove it. For readers convenience I have added link to https://support.torproject.org where they can read about the Onion Browser from the Tor Project's perspective. I know, this is not Wikipedia and we do not have to source everything, however, in the Firefox for iOS, there is link to Disconnect's website, just so users can read about their Tracking protection lists, and being able to quickly verify that the Onion Browser is really officially endorsed by the Tor Project is arguably much more important, therefore the link should be included. Other, more explicit, endorsement on torproject.org is in a small print under Android download page https://torproject.org/download/index.html#android that says "Are you an iOS user? We encourage you to try Onion Browser.", however this one is much less visible, because of that I'm not using this link.	2021-03-14 12:16:32 +00:00
gudishvibes	904b699feb	Fix search bar not passing searches to Searx (#2086 ) The URL to pass searches to was https://search.privacytools.io/searx, instead of https://search.privacytools.io. So I changed the URL of the search bar form.	2021-01-23 21:32:53 +00:00
Gusted	148e1e7455	Add warning to Invidious (#2182 ) - Add warning for non-default proxy option.	2021-01-13 10:44:35 +00:00
Daniel Nathan Gray	2fcb959eb8	Update Temp container bug (#2173 )	2021-01-06 16:53:22 +00:00
Gusted	c1dbe5890a	Removed Closed Souce Warning from Cryptomator (#2177 )	2021-01-06 16:52:24 +00:00
Gusted	43aa060b1e	Remove IVPN trial notice (#2178 )	2021-01-06 16:50:50 +00:00
Gusted	431ee21055	Update Ruby Dependencies (#2168 )	2020-12-29 13:58:02 +00:00
Gusted	1fab03f479	Update Javascript dependencies (#2166 )	2020-12-29 13:52:16 +00:00
felix	1b0b1f6688	Misspell on the URL Link. (#2172 )	2020-12-29 13:26:57 +00:00
Gusted	b4126a3524	Fix for tooltips on badge (#2167 )	2020-12-29 13:25:10 +00:00
Gusted	21c894eef7	Cleanup jQuery (#2139 )	2020-12-13 20:37:35 +00:00
schwukas	afd7e216ce	Change Riot Name and Link to Element (#2151 )	2020-12-12 05:27:08 +00:00
Daniel Nathan Gray	5142ef18ab	New email client section, thanks @freddy-m (#2142 ) * New email client section, thanks @freddy-m * That email clients cleanup (#1990) Co-authored-by: Freddy <freddy@privacytools.io>	2020-11-26 10:59:44 +00:00
Tom Hacohen	d10079b643	Notebooks: added EteSync to worth mentioning. (#2115 ) EteSync is already listed under contacts/calendars, but there's now also notes support.	2020-11-19 18:32:17 +00:00
Freddy	e5dc5d7e30	Remove Keka (#2129 ) * Remove Keka * Remove badge, and fix indenting Co-authored-by: Daniel Gray <dng@disroot.org>	2020-11-18 10:22:27 +00:00
Wylel	f625f80ca8	Fix typo (#2124 ) Firefox Section Changed "but users can manually any other DoH resolver." to "but users can manually use any other DoH resolver."	2020-11-13 11:37:29 +00:00
Daniel Nathan Gray	50ec5fb2c1	Remove ThatOnePrivacySite (#2114 )	2020-11-04 07:11:54 +00:00
Daniel Nathan Gray	9ba33b3a53	Fix labels, to be consistent (#2108 ) * Fix labels, to be consistent * s/icon/text * Use a warning icon	2020-10-30 12:08:53 +00:00
David Breese	085256ee88	Fix broken Bootstrap license link in LibreJS page (#2103 )	2020-10-27 15:34:10 +00:00
Lynn Stephenson	e42553fbc2	Change K-9 Mail's link to the official site. (#2101 )	2020-10-23 01:25:52 +00:00
Lynn Stephenson	256fae4bdf	Add Kryptor as worth mentioning. (#2100 )	2020-10-22 08:35:55 +01:00
Mikaela Suomalainen	7db82b296b	DNS: document iOS 14+ & macOS Big Sur encrypted DNS (#2099 ) * dns: begin another take at Apple's native encrypted DNS * dns.html: mention mobileconfigs, versions and where to find them * dns.html: fix clumsy heading * dns: remove excess > * dns: small clarification open in Safari, others won't work * Use two spaces, slightly reword. * Use nice name Co-authored-by: Daniel Gray <dng@disroot.org>	2020-10-22 08:15:15 +01:00