diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index ee30fb33..e3065f8c 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -24,9 +24,16 @@ We're trying to keep it simple and promote the best tools, not all of them. There can be exceptions if no software is available that meet the criteria. Note: This criteria applies to all of privacytools.io -### Proividers +### Providers - Prioritize Products by privacy respecting nationality. +### DNS + +- supports DoH or DoT (We love DNSCrypt, but there is already https://github.com/DNSCrypt/dnscrypt-resolvers which is directly supported by dnscrypt-proxy, so we don't consider useful to list providers only supporting it). +- supports DNSSEC (https://dnssec.vs.uni-due.de/ can test your current DNS provider). +- doesn't log IP addresses during normal operation (If your suggestion logs, please compare its privacy policy with other servers on our table that keep logs). +- preferably supports QNAME minimization (if you have access to the dig command, `dig +short txt qnamemintest.internet.nl` or `Resolve-DnsName -Type TXT -Name qnamemintest.internet.nl` if you are on Windows 10) + ### VPN - Prioritize Products by privacy respecting nationality. - Cannot be based in USA or UK. diff --git a/.github/ISSUE_TEMPLATE/7_DNS_provider.md b/.github/ISSUE_TEMPLATE/7_DNS_provider.md index 06be8abf..174910f5 100644 --- a/.github/ISSUE_TEMPLATE/7_DNS_provider.md +++ b/.github/ISSUE_TEMPLATE/7_DNS_provider.md @@ -33,4 +33,4 @@ labels: 🌐 website issue, 🗄️ DNS #### Desired features -* [ ] supports QNAME minimization +* [ ] supports QNAME minimization diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 3df664f7..88e4f94f 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,17 +1,19 @@ - + ## Description -Resolves: #none #### Check List -- [ ] I have read and understand [CONTRIBUTING.md](https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md). +- [ ] I have read and understand [the contributing guidelines](https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md). -- [ ] I have listed the source code for this project in [source_code.md](https://github.com/privacytoolsIO/privacytools.io/blob/master/source_code.md). +- [ ] I have [listed the source code](https://github.com/privacytoolsIO/privacytools.io/blob/master/source_code.md). - [ ] This project is [free/libre software](https://www.wikipedia.org/wiki/Free_software). - [ ] This project has an [associated discussion](https://github.com/privacytoolsIO/privacytools.io/issues). -Code Repository (if applicable): +* Netlify preview for the mainly edited page: + +* Code Repository (if applicable): diff --git a/.gitignore b/.gitignore index af408d27..e6cb179f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,8 @@ _site/ -Gemfile -Gemfile.lock .sass-cache/ +.jekyll-metadata .DS_Store +font/assets/ +font/_sass/ +font/.fontcustom-manifest.json +assets/webfonts/ptio-font-preview.html diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 00000000..c03da44c --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,88 @@ +# privacytools.io Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to make participation in our project and +our community a harassment-free experience for everyone, regardless of a +distinction of any kind, such as age, body size, disability, ethnicity, sex +characteristics, gender identity and expression, level of experience, +education, socio-economic status, nationality, personal appearance, race, +religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention + or advances +* Trolling, insulting/derogatory, antagonistic comments and personal or + political attacks +* Promoting intolerance +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of +acceptable behavior and are expected to take appropriate and fair +corrective action in response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem +inappropriate, threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies within all project spaces, and it also applies +when an individual is representing as a part of the project or its +community in public spaces. + +Examples of representing a project or community include using an official +project e-mail address, posting via an official social media account, or +acting as an appointed representative at an online or offline event. +Representation of a project may be further defined and clarified by +project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting blacklight447 via email on +blacklight447@privacytools.io or [any team member on our forum]. +The reports should include information on whether they can be shared to +other team members and how much may be told. + +[any team member on our forum]:https://forum.privacytools.io/g/team + +All complaints will be reviewed and investigated and will result in a +response that is deemed necessary and appropriate to the circumstances. +The project team is obligated to maintain confidentiality with regard to the +reporter of an incident. Further details of specific enforcement policies +may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership. + +## Attribution + +This Code of Conduct is forked from and licensed under Creative Commons +BY-4.0, [Contributor Covenant version 1.4] by privacytools.io, which you can +[find on our GitHub repository]. + +[find on our GitHub repository]:https://github.com/privacytoolsIO/privacytools.io/blob/master/CODE_OF_CONDUCT.md +[Contributor Covenant version 1.4]:https://contributor-covenant.org/version/1/4 diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 00000000..05594934 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,249 @@ +GEM + remote: https://rubygems.org/ + specs: + activesupport (4.2.11.1) + i18n (~> 0.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.11.1) + 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) + 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) + multipart-post (>= 1.2, < 3) + ffi (1.11.1) + forwardable-extended (2.6.0) + gemoji (3.0.1) + github-pages (198) + activesupport (= 4.2.11.1) + github-pages-health-check (= 1.16.1) + jekyll (= 3.8.5) + jekyll-avatar (= 0.6.0) + jekyll-coffeescript (= 1.1.1) + jekyll-commonmark-ghpages (= 0.1.5) + jekyll-default-layout (= 0.1.4) + jekyll-feed (= 0.11.0) + jekyll-gist (= 1.5.0) + jekyll-github-metadata (= 2.12.1) + jekyll-mentions (= 1.4.1) + jekyll-optional-front-matter (= 0.3.0) + 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-sass-converter (= 1.5.2) + jekyll-seo-tag (= 2.5.0) + jekyll-sitemap (= 1.2.0) + jekyll-swiss (= 0.4.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-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-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) + mercenary (~> 0.3) + minima (= 2.5.0) + nokogiri (>= 1.8.5, < 2.0) + rouge (= 2.2.1) + terminal-table (~> 1.4) + github-pages-health-check (1.16.1) + addressable (~> 2.3) + dnsruby (~> 1.60) + octokit (~> 4.0) + public_suffix (~> 3.0) + typhoeus (~> 1.3) + html-pipeline (2.12.0) + activesupport (>= 2) + nokogiri (>= 1.4) + http_parser.rb (0.6.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + jekyll (3.8.5) + 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) + 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-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) + commonmarker (~> 0.17.6) + jekyll-commonmark (~> 1) + rouge (~> 2) + jekyll-default-layout (0.1.4) + jekyll (~> 3.0) + jekyll-feed (0.11.0) + jekyll (~> 3.3) + jekyll-gist (1.5.0) + octokit (~> 4.2) + jekyll-github-metadata (2.12.1) + jekyll (~> 3.4) + octokit (~> 4.0, != 4.4.0) + jekyll-mentions (1.4.1) + html-pipeline (~> 2.3) + jekyll (~> 3.0) + jekyll-optional-front-matter (0.3.0) + jekyll (~> 3.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-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-theme-architect (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-cayman (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-dinky (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-hacker (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-leap-day (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-merlot (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-midnight (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-minimal (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-modernist (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-primer (0.5.3) + jekyll (~> 3.5) + jekyll-github-metadata (~> 2.9) + jekyll-seo-tag (~> 2.0) + jekyll-theme-slate (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + jekyll-theme-tactile (0.1.1) + jekyll (~> 3.5) + jekyll-seo-tag (~> 2.0) + 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-watch (2.2.1) + listen (~> 3.0) + jemoji (0.10.2) + 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) + mercenary (0.3.6) + mini_portile2 (2.4.0) + minima (2.5.0) + jekyll (~> 3.5) + jekyll-feed (~> 0.9) + jekyll-seo-tag (~> 2.1) + minitest (5.11.3) + multipart-post (2.1.1) + nokogiri (1.10.4) + mini_portile2 (~> 2.4.0) + octokit (4.14.0) + 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) + ffi (~> 1.0) + rouge (2.2.1) + ruby-enum (0.7.2) + i18n + ruby_dep (1.5.0) + rubyzip (1.2.3) + safe_yaml (1.0.5) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sawyer (0.8.2) + addressable (>= 2.3.5) + faraday (> 0.8, < 2.0) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) + thread_safe (0.3.6) + typhoeus (1.3.1) + ethon (>= 0.9.0) + tzinfo (1.2.5) + thread_safe (~> 0.1) + unicode-display_width (1.6.0) + +PLATFORMS + ruby + +DEPENDENCIES + github-pages + tzinfo-data + +BUNDLED WITH + 2.0.1 diff --git a/_config.yml b/_config.yml index 355e9fe6..eac523d4 100644 --- a/_config.yml +++ b/_config.yml @@ -8,3 +8,4 @@ plugins: sitemap: file: "/sitemap.xml" include: [".well-known"] +exclude: ["font", "vendor"] diff --git a/_includes/cardv2.html b/_includes/cardv2.html index 86f6e3f0..13fdab57 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -1,53 +1,295 @@
-

{{include.title}}

+

+ {% if include.badges %} + {{ include.title }} + {% assign badges = include.badges | split:"|" %} + {% for badge in badges %} + {% assign badge_data = badge | split:":" %} + {% assign color = badge_data[0] %} + {% assign text = badge_data[1] %} + {% assign tooltip = badge_data[2] | default: false %} + {% assign help_icon = '' %} + {{text}} {{ help_icon }} + {% else %} + > {{text}} + {% endif %} + + {% endfor %} + {% else %} + {{ include.title }} + {% endif %} +

- {{include.title}} - {{include.description}} + {{include.title}} + {{ include.description }} + {% if include.labels %} + {% assign labels = include.labels | split:"|" %} + {% for label in labels %} + {% assign label_data = label | split:":" %} + {% assign color = label_data[0] %} + {% assign text = label_data[1] %} + {% assign tooltip = label_data[2] | default: false %} + {% assign help_icon = '' %} + {{text}} {{ help_icon }} + {% else %} + > {{text}} + {% endif %} + + {% endfor %} + {% endif %}

- Website + + + Website + {% if include.forum %} - Forum + + + Forum + {% endif %} {% if include.tor %} - Tor + + Tor + {% endif %}
- {% if include.windows %}{% endif %} - {% if include.mac %}{% endif %} - {% if include.linux %}{% endif %} - {% if include.bsd %}{% endif %} + {% if include.windows %} + {% if include.windows != "" %} + + + + {% else %} + + {% endif %} + {% endif %} - {% if include.firefox %}{% endif %} - {% if include.chrome %}{% endif %} - {% if include.safari %}{% endif %} - {% if include.opera %}{% endif %} - {% if include.edge %}{% endif %} + {% if include.mac %} + {% if include.mac != "" %} + + + + {% else %} + + {% endif %} + {% endif %} - {% if include.android %}{% endif %} - {% if include.ios %}{% endif %} - {% if include.fire %}{% endif %} + {% if include.linux %} + {% if include.linux != "" %} + + + + {% else %} + + {% endif %} + {% endif %} - {% if include.web %}{% endif %} + {% if include.freebsd %} + {% if include.freebsd != "" %} + + + + {% else %} + + {% endif %} + {% endif %} + + {% if include.openbsd %} + {% if include.openbsd != "" %} + + + + {% else %} + + {% endif %} + {% endif %} + + {% if include.netbsd %} + {% if include.netbsd != "" %} + + + + {% else %} + + {% endif %} + {% endif %} + + {% if include.firefox %} + {% if include.firefox != "" %} + + + + {% else %} + + {% endif %} + {% endif %} + + {% if include.chrome %} + {% if include.chrome != "" %} + + + + {% else %} + + {% endif %} + {% endif %} + + {% if include.safari %} + {% if include.safari != "" %} + + + + {% else %} + + {% endif %} + {% endif %} + + {% if include.opera %} + {% if include.opera != "" %} + + + + {% else %} + + {% endif %} + {% endif %} + + {% if include.edge %} + {% if include.edge != "" %} + + + + {% else %} + + {% endif %} + {% endif %} + + {% if include.fdroid %} + {% if include.fdroid != "" %} + + + + {% else %} + + {% endif %} + {% endif %} + + {% if include.googleplay %} + {% if include.googleplay != "" %} + + + + {% else %} + + {% endif %} + {% endif %} + + {% if include.android %} + {% if include.android != "" %} + + + + {% else %} + + {% endif %} + {% endif %} + + {% if include.ios %} + {% if include.ios != "" %} + + + + {% else %} + + {% endif %} + {% endif %} + + {% if include.sailfish %} + {% if include.sailfish != "" %} + + + + {% else %} + + {% endif %} + {% endif %} + + {% if include.web %} + {% if include.web != "" %} + + + + {% else %} + + {% endif %} + {% endif %} {{include.icon1}} {{include.icon2}} {{include.icon3}} - {% if include.github %}{% endif %} - {% if include.gitlab %}{% endif %} - {% if include.git %}{% endif %} - {% if include.source %}{% endif %} + {% if include.github %} + + + + {% endif %} + + {% if include.gitlab %} + + + + {% endif %} + + {% if include.git %} + + + + {% endif %} + + {% if include.source %} + + + + {% endif %}
-

diff --git a/_includes/footer.html b/_includes/footer.html index 7472a098..1ca12dfc 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -71,8 +71,19 @@
-

No Ads, No Google Analytics, No Affiliates, No Cross-Site Requests. privacytools.io is a socially motivated website that provides information for protecting your data security and privacy. Never trust any company with your privacy, always encrypt. View our privacy policy.

-

Tor v3: privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd.onion (Learn More)

-
+ + + JavaScript Licenses + +

+ No Ads, No Google Analytics, No Affiliates, No Cross-Site Requests. + privacytools.io is a socially motivated website that provides information for protecting your data security and privacy. Never trust any company with your privacy, always encrypt. + View our privacy policy. +

+

+ Tor v3: privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd.onion + (Learn More) +

+ diff --git a/_includes/head.html b/_includes/head.html index d2fb0f51..e92adfa3 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -43,5 +43,6 @@ - + + diff --git a/_includes/nav.html b/_includes/nav.html index bbdf70b5..776492e4 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -33,6 +33,7 @@ Social Networks Social News Aggregators Video Streaming VPN + VPN diff --git a/_includes/scripts.html b/_includes/scripts.html index cdc7e515..b5ed2d18 100644 --- a/_includes/scripts.html +++ b/_includes/scripts.html @@ -2,17 +2,7 @@ - + - diff --git a/_includes/sections/browser-addons.html b/_includes/sections/browser-addons.html index 5e3f3d9f..3e9463ea 100644 --- a/_includes/sections/browser-addons.html +++ b/_includes/sections/browser-addons.html @@ -1,7 +1,7 @@ -

Excellent Firefox Privacy Add-ons

+

Recommended Browser Add-ons

@@ -12,10 +12,9 @@ description="Privacy Badger is a browser add-on that stops adve website="https://www.eff.org/privacybadger" forum="https://forum.privacytools.io/t/discussion-privacy-badger/265" github="https://github.com/EFForg/privacybadger" -firefox="" -chrome="" -opera="" -android="" +firefox="https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17" +chrome="https://chrome.google.com/webstore/detail/privacy-badger/pkehgijcmpdhfbdbbnkijodmdjhbjlgp" +opera="https://addons.opera.com/en/extensions/details/privacy-badger/" %} {% include cardv2.html @@ -25,12 +24,11 @@ description="uBlock Origin is an efficient For Experts Only +

For Power Users Only

-Fingerprint image +Fingerprint image

When you visit a web page, your browser voluntarily sends information about its configuration, such as available fonts, browser type, and add-ons. If this combination of information is unique, it may be possible to identify and track you without using cookies. EFF created a Tool called Panopticlick to test your browser to see how unique it is.

diff --git a/_includes/sections/browser-recommendation.html b/_includes/sections/browser-recommendation.html index cf4195e3..e1969768 100644 --- a/_includes/sections/browser-recommendation.html +++ b/_includes/sections/browser-recommendation.html @@ -1,4 +1,4 @@ -

Browser Recommendation

+

Browser Recommendations

{% include cardv2.html title="Mozilla Firefox" @@ -8,39 +8,28 @@ recommendations: WebRTC and How does Tor work?' website="https://www.torproject.org/" forum="https://forum.privacytools.io/t/discussion-tor-browser/278" git="https://trac.torproject.org/projects/tor" -windows="" -mac="" -linux="" -android="" -ios="" -bsd="" -%} - -{% include cardv2.html -title="Brave Browser - Complete but Experimental" -image="/assets/img/tools/Brave.png" -description="The new open source browser Brave automatically blocks ads and trackers, making it faster and safer than your current browser. Brave is based on Chromium. experimental " -website="https://brave.com/" -forum="https://forum.privacytools.io/t/discussion-brave-browser/280" -github="https://github.com/brave" -windows="" -mac="" -linux="" -android="" -ios="" +windows="https://www.torproject.org/download/" +mac="https://www.torproject.org/download/" +linux="https://www.torproject.org/download/" +android="https://www.torproject.org/download/#android" +fdroid="https://guardianproject.info/fdroid/" +googleplay="https://play.google.com/store/apps/details?id=org.torproject.torbrowser" %} diff --git a/_includes/sections/browser-tweaks.html b/_includes/sections/browser-tweaks.html index 277bbd57..9bdd6c4c 100644 --- a/_includes/sections/browser-tweaks.html +++ b/_includes/sections/browser-tweaks.html @@ -28,15 +28,6 @@
privacy.trackingprotection.enabled = true
This is Mozilla's new built-in tracking protection. It uses Disconnect.me filter list, which is redundant if you are already using uBlock Origin 3rd party filters, therefore you should set it to false if you are using the add-on functionalities.
-
browser.cache.offline.enable = false
-
Disables offline cache.
- -
browser.safebrowsing.malware.enabled = false
-
Disable Google Safe Browsing malware checks. Security risk, but privacy improvement.
- -
browser.safebrowsing.phishing.enabled = false
-
Disable Google Safe Browsing and phishing protection. Security risk, but privacy improvement.
-
browser.send_pings = false
The attribute would be useful for letting websites track visitors' clicks.
@@ -46,15 +37,10 @@
browser.urlbar.speculativeConnect.enabled = false
Disable preloading of autocomplete URLs. Firefox preloads URLs that autocomplete when a user types into the address bar, which is a concern if URLs are suggested that the user does not want to connect to. Source
-
dom.battery.enabled = false
-
The battery status of your device could be tracked.
dom.event.clipboardevents.enabled = false
Disable that websites can get notifications if you copy, paste, or cut something from a web page, and it lets them know which part of the page had been selected.
-
geo.enabled = false
-
Disables geolocation.
-
media.eme.enabled = false

Disables playback of DRM-controlled HTML5 content, which, if enabled, automatically downloads the Widevine Content Decryption Module provided by Google Inc. Details

@@ -77,26 +63,7 @@
-
network.cookie.lifetimePolicy = 2
-
- cookies are deleted at the end of the session - -
-
network.http.referer.trimmingPolicy = 2
-
- Send only the scheme, host, and port in the Referer header - -
network.http.referer.XOriginPolicy = 2
@@ -118,23 +85,8 @@
-
network.trr.mode = 2
-
- Use Trusted Recursive Resolver (DNS-over-HTTPS) first and if it fails, use the system resolver Source - -
- -
network.trr.uri = CHANGEME
-
The address of your DNS-over-HTTPS provider, if you don't have one, check our encrypted DNS recommendations. It can also be changed in Settings, Network Settings, Enable DNS over HTTPS, Use Provider, Custom.
- -
network.security.esni.enabled = true
-
Hide the address which you are requesting SSL certificate for if the server supports it. This requires DoH/TRR to be enabled even on Android 9+ when Private DNS is enabled.
+
Looking for TRR, DoH or ESNI?
+
They have moved to our DNS page.
webgl.disabled = true
WebGL is a potential security risk. Source
@@ -149,23 +101,14 @@ -
extensions.pocket.enabled = false
-
Disables Pocket completely.
network.IDN_show_punycode = true
Not rendering IDNs as their Punycode equivalent leaves you open to phishing attacks that can be very difficult to notice. Source
-
extensions.blocklist.url = https://blocklists.settings.services.mozilla.com/v1/blocklist/3/%20/%20/
-
-

Limit the amount of identifiable information sent when requesting the Mozilla harmful extension blocklist. -

Optionally, the blocklist can be disabled entirely by setting extensions.blocklist.enabled to false for increased privacy, but decreased security. Source

-
- -

Firefox user.js Templates

+

Firefox user.js Templates

diff --git a/_includes/sections/calendar-contacts-sync.html b/_includes/sections/calendar-contacts-sync.html index 6a4ff713..9d12ec3b 100644 --- a/_includes/sections/calendar-contacts-sync.html +++ b/_includes/sections/calendar-contacts-sync.html @@ -4,34 +4,47 @@ If you are currently using a calendar and or contacts synchronization service like Google Sync or iCloud, you should pick an alternative here. -
- - {% include card.html color="success" +{% + include cardv2.html title="Nextcloud" image="/assets/img/provider/Nextcloud.png" - url="https://nextcloud.com/" - footer="Client OS: Windows, macOS, Linux, BSD, Unix, iOS, Android, Fire OS. Server: Linux." - description="NextCloud is a suite of client-server software for creating and using file hosting services. This includes calendar sync via CalDAV and contacts sync via CardDAV. Nextcloud is free and open-source, thereby allowing anyone to install and operate it without charge on a private server." - %} + description="Nextcloud is a suite of client-server software for creating and using file hosting services. This includes calendar sync via CalDAV and contacts sync via CardDAV. Nextcloud is free and open-source, thereby allowing anyone to install and operate it without charge on a private server." + website="https://nextcloud.com/" + forum="https://forum.privacytools.io/t/discussion-nextcloud-calender-contacts-sync-tools/1535" + github="https://github.com/nextcloud" + windows="https://nextcloud.com/install/" + linux="https://nextcloud.com/install/" + mac="https://nextcloud.com/install/" + freebsd="https://www.freshports.org/deskutils/nextcloudclient/" + openbsd="http://openports.se/www/nextcloud" + netbsd="http://pkgsrc.se/www/php-nextcloud" + android="https://nextcloud.com/install/" + ios="https://nextcloud.com/install/" +%} - {% include card.html color="primary" +{% + include cardv2.html title="Email Providers" image="/assets/img/misc/email.png" - url="../email" - website="Email Providers section" - footer="OS: depends on email provider." - description="Many email providers also offer calendar and or contacts sync services. Refer to the Email Providers section to choose an email provider and check if they also offer calendar and or contacts sync." - %} + description='Many email providers also offer calendar and or contacts sync services. Refer to the Email Providers section to choose an email provider and check if they also offer calendar and or contacts sync.' + website="/providers/email" +%} - {% include card.html color="warning" +{% + include cardv2.html title="EteSync" image="/assets/img/provider/etesync.png" - url="https://www.etesync.com/" - footer="Client OS: Android, Web. Server OS: Linux." - description="EteSync is a secure, end-to-end encrypted and journaled personal information (e.g. contacts and calendar) cloud synchronization and backup for Android and any OS that supports CalDAV/CardDAV. It costs $14 per year to use, or you can host the server yourself for free." - %} - -
+ description="EteSync is a secure, end-to-end encrypted and journaled personal information (e.g. contacts and calendar) cloud synchronization and backup for Android and any OS that supports CalDAV/CardDAV. It costs $14 per year to use, or you can host the server yourself for free." + website="https://www.etesync.com/" + forum="https://forum.privacytools.io/t/discussion-etesync-calender-contacts-sync-tools/1536" + github="https://github.com/etesync" + web="https://client.etesync.com/" + windows="https://github.com/etesync/etesync-dav/blob/master/README.md#installation" + mac="https://github.com/etesync/etesync-dav/blob/master/README.md#installation" + linux="https://github.com/etesync/etesync-dav/blob/master/README.md#installation" + fdroid="https://f-droid.org/packages/com.etesync.syncadapter/" + googleplay="https://play.google.com/store/apps/details?id=com.etesync.syncadapter" +%}

Worth Mentioning

@@ -41,10 +54,6 @@
  • - Flock - a discontinued calendar and contacts sync service by Open Whisper Systems. Despite being shut down the source code is still available on GitHub. -
    • - -
  • - cloud backups - consider regularly exporting your calendar and or contacts and backing them up on a separate storage drive or uploading them to cloud storage (ideally after encrypting them). + cloud backups - consider regularly exporting your calendar and or contacts and backing them up on a separate storage drive or uploading them to cloud storage (ideally after encrypting them).
    • diff --git a/_includes/sections/cloud-storage.html b/_includes/sections/cloud-storage.html index 90cbd5ff..5a67b9fd 100644 --- a/_includes/sections/cloud-storage.html +++ b/_includes/sections/cloud-storage.html @@ -11,26 +11,27 @@ description="Similar functionally to the widely used Dropbox, with the differenc website="https://nextcloud.com/" forum="https://forum.privacytools.io/t/discussion-nextcloud/287" github="https://github.com/nextcloud" -windows="" -mac="" -linux="" -bsd="" -ios="" -android="" -fire="" +windows="https://nextcloud.com/install/#install-clients" +mac="https://nextcloud.com/install/#install-clients" +linux="https://nextcloud.com/install/#install-clients" +freebsd="https://www.freshports.org/www/nextcloud/" +openbsd="http://openports.se/www/nextcloud" +netbsd="http://pkgsrc.se/www/php-nextcloud" +ios="https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8" +fdroid="https://f-droid.org/packages/com.nextcloud.client/" +googleplay="https://play.google.com/store/apps/details?id=com.nextcloud.client" %} {% include cardv2.html title="Least Authority S4 - For Experts" -image="/assets/img/provider/S4.jpg" +image="/assets/img/provider/S4.png" description="S4 (Simple Secure Storage Service) is Least Authority's verifiably secure off-site backup system for individuals and businesses. 100% client-side encryption and open source transparency. 250GB for $9.95/month or 5TB for $25.95/month. Servers are hosted with Amazon S3 in the US." website="https://leastauthority.com/" forum="https://forum.privacytools.io/t/discussion-least-authority-s4/288" github="https://github.com/LeastAuthority" -windows="" -mac="" -linux="" -bsd="" +windows="https://github.com/gridsync/gridsync#installation-and-running" +mac="https://github.com/gridsync/gridsync#installation-and-running" +linux="https://github.com/gridsync/gridsync#installation-and-running" %} diff --git a/_includes/sections/dns.html b/_includes/sections/dns.html index ded7b326..ee6c1f68 100644 --- a/_includes/sections/dns.html +++ b/_includes/sections/dns.html @@ -1,40 +1,33 @@

    Domain Name System (DNS)

    -{% include cardv2.html -title="OpenNIC - Service" -image="/assets/img/tools/OpenNIC.png" -description="OpenNIC is an alternate network information center/alternative DNS root which lists itself as an alternative to ICANN and its registries. Like all alternative root DNS systems, OpenNIC-hosted domains are unreachable to the vast majority of the Internet." -website="https://www.opennic.org/" -forum="https://forum.privacytools.io/t/discussion-opennic/338" -github="https://github.com/OpenNIC" +{% + include cardv2.html + title="Njalla - Domain Registration" + image="/assets/img/provider/Njalla.png" + description="Njalla only needs your email or XMPP address in order to register a domain name for you. Created by people from The Pirate Bay and IPredator VPN. Accepted Payments: Bitcoin, Litecoin, Monero, DASH, Bitcoin Cash and PayPal. A privacy-aware domain registration service." + website="https://njal.la/" + tor="http://njalladnspotetti.onion" + forum="https://forum.privacytools.io/t/discussion-njalla/339" %} -{% include cardv2.html -title="Njalla - Domain Registration" -image="/assets/img/provider/Njalla.png" -description="Njalla only needs your email or jabber address in order to register a domain name for you. Created by people from The Pirate Bay and IPredator VPN. Accepted Payments: Bitcoin, Litecoin, Monero, DASH, Bitcoin Cash and PayPal. A privacy-aware domain registration service." -website="https://njal.la/" -tor="http://njalladnspotetti.onion" -forum="https://forum.privacytools.io/t/discussion-njalla/339" +{% + include cardv2.html + title="DNSCrypt-Proxy - Tool" + image="/assets/img/tools/DNSCrypt-Proxy.png" + description="DNSCrypt-Proxy is a command-line DNS proxy with support for the encrypted DNS protocols, DNS over HTTPS and DNSCrypt. Can cache results to improve speed, and allows filtering, forwarding, and cloaking." + website="https://github.com/jedisct1/dnscrypt-proxy/" + forum="https://forum.privacytools.io/t/discussion-dnscrypt-proxy/1498" + github="https://github.com/jedisct1/dnscrypt-proxy/" + windows="https://github.com/jedisct1/dnscrypt-proxy/releases" + linux="" + mac="https://github.com/jedisct1/dnscrypt-proxy/releases" + freebsd="https://www.freshports.org/dns/dnscrypt-proxy2/" + openbsd="http://openports.se/net/dnscrypt-proxy" + netbsd="http://pkgsrc.se/net/dnscrypt-proxy2" + android="" + ios="" %} -{% include cardv2.html -title="DNSCrypt - Tool" -image="/assets/img/tools/DNSCrypt.png" -description="A protocol for securing communications between a client and a DNS resolver. The DNSCrypt protocol uses high-speed high-security elliptic-curve cryptography and is very similar to DNSCurve, but focuses on securing communications between a client and its first-level resolver." -website="https://dnscrypt.info/" -forum="https://forum.privacytools.io/t/discussion-dnscrypt/340" -github="https://github.com/jedisct1/dnscrypt-proxy" -%} - -

    Worth Mentioning

    - - -

    Encrypted ICANN DNS Providers

    -

    Terms

    +

    Terms

    - + -

    Worth Mentioning and Additional Information

    +

    How to verify DNS is encrypted

    - - \ No newline at end of file + + +

    Worth Mentioning and Additional Information

    + + diff --git a/_includes/sections/email-alternatives.html b/_includes/sections/email-alternatives.html index 94c48ff8..64eee0fa 100644 --- a/_includes/sections/email-alternatives.html +++ b/_includes/sections/email-alternatives.html @@ -8,9 +8,9 @@ meaning that you need-not inherently trust any entities like root certificate au website="https://bitmessage.org/" forum="https://forum.privacytools.io/t/discussion-bitmessage/661" github="https://github.com/Bitmessage/PyBitmessage" -windows="" -mac="" -linux="" +windows="https://github.com/Bitmessage/PyBitmessage/releases" +mac="https://github.com/Bitmessage/PyBitmessage/releases" +linux="https://repology.org/project/pybitmessage/versions" %} {% include cardv2.html @@ -20,9 +20,10 @@ description="Retroshare creates encrypted connections to your friends. Nobody ca website="https://retroshare.cc/" forum="https://forum.privacytools.io/t/discussion-retroshare/662" github="https://github.com/RetroShare/RetroShare" -windows="" -mac="" -linux="" +windows="https://retroshare.cc/downloads.html#windows" +mac="https://retroshare.cc/downloads.html#mac" +linux="https://retroshare.cc/downloads.html#gnulinux" +freebsd="https://retroshare.cc/downloads.html#freebsd" %} diff --git a/_includes/sections/email-clients.html b/_includes/sections/email-clients.html index e4a0047b..f1f8f814 100644 --- a/_includes/sections/email-clients.html +++ b/_includes/sections/email-clients.html @@ -7,10 +7,12 @@ description="Thunderbird is a free, open source, cross-platform email, newsgroup website="https://www.thunderbird.net/" forum="https://forum.privacytools.io/t/discussion-thunderbird/659" source="https://hg.mozilla.org/comm-central/" -windows="" -mac="" -linux="" -bsd="" +windows="https://www.thunderbird.net/en-US/" +mac="https://www.thunderbird.net/en-US/" +linux="https://www.thunderbird.net/en-US/" +freebsd="https://www.freshports.org/mail/thunderbird/" +openbsd="http://openports.se/mail/mozilla-thunderbird" +netbsd="http://pkgsrc.se/mail/thunderbird" %} {% include cardv2.html @@ -20,10 +22,12 @@ description="Claws Mail is a free and open source, GTK-based email and news clie website="https://www.claws-mail.org/" forum="https://forum.privacytools.io/t/discussion-claws-mail/660" git="https://git.claws-mail.org/" -windows="" -mac="" -linux="" -bsd="" +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" %} diff --git a/_includes/sections/email-providers.html b/_includes/sections/email-providers.html index 74c17fe8..c12a00a3 100644 --- a/_includes/sections/email-providers.html +++ b/_includes/sections/email-providers.html @@ -8,7 +8,7 @@ - + @@ -23,72 +23,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + @@ -96,32 +71,101 @@ WWW - + - + - + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + + + + + + + + + + + + @@ -129,75 +173,75 @@ WWW - + - + - - - - - - - - - - - - - - + - + + - - - + - + - - - - - - + + + + + diff --git a/_includes/sections/file-encryption.html b/_includes/sections/file-encryption.html index ad374d8d..f66d584a 100644 --- a/_includes/sections/file-encryption.html +++ b/_includes/sections/file-encryption.html @@ -4,44 +4,58 @@ If you are currently not using encryption software for your hard disk, emails or file archives, you should pick an encryption software here. -
    - - {% include card.html color="success" +{% + include cardv2.html title="VeraCrypt - Disk Encryption" image="/assets/img/tools/VeraCrypt.png" - url="https://veracrypt.fr/" - footer="OS: Windows, macOS, Linux." - description="VeraCrypt is a source-available freeware utility used for on-the-fly encryption. It can create a virtual encrypted disk within a file or encrypt a partition - or the entire storage device with pre-boot authentication. VeraCrypt is a fork of the discontinued TrueCrypt project. It was initially released on June 22, 2013. According to its developers, security improvements have been implemented and issues - raised by the initial TrueCrypt code audit have been addressed." - %} + description="VeraCrypt is a source-available freeware utility used for on-the-fly encryption. It can create a virtual encrypted disk within a file or encrypt a partition or the entire storage device with pre-boot authentication. VeraCrypt is a fork of the discontinued TrueCrypt project. It was initially released on June 22, 2013. According to its developers, security improvements have been implemented and issues raised by the initial TrueCrypt code audit have been addressed." + website="https://veracrypt.fr/" + forum="https://forum.privacytools.io/t/discussion-veracrypt-file-encryption/1532" + git="https://www.veracrypt.fr/code/" + windows="https://www.veracrypt.fr/en/Downloads.html" + linux="https://www.veracrypt.fr/en/Downloads.html" + mac="https://www.veracrypt.fr/en/Downloads.html" +%} - {% include card.html color="primary" +{% + include cardv2.html title="GNU Privacy Guard - Email Encryption" image="/assets/img/tools/GnuPG.png" - url="https://gpgtools.org/" - footer="OS: Windows, macOS, Linux, Android, BSD." - description="GnuPG is a GPL Licensed alternative to the PGP suite of cryptographic software. GnuPG is compliant with RFC 4880, which is the current IETF standards track specification - of OpenPGP. Current versions of PGP (and Veridis' Filecrypt) are interoperable with GnuPG and other OpenPGP-compliant systems. GnuPG is a part of the Free Software Foundation's GNU software project, and has received major funding from the German - government. GPGTools for macOS." - %} + description="GnuPG is a GPL Licensed alternative to the PGP suite of cryptographic software. GnuPG is compliant with RFC 4880, which is the current IETF standards track specification of OpenPGP. Current versions of PGP (and Veridis' Filecrypt) are interoperable with GnuPG and other OpenPGP-compliant systems. GnuPG is a part of the Free Software Foundation's GNU software project, and has received major funding from the German government." + website="https://gnupg.org/" + forum="https://forum.privacytools.io/t/discussion-gnupg-file-encryption/1533" + git="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git" + windows="https://gpg4win.org/download.html" + linux="https://gnupg.org/download/index.html#binary" + freebsd="https://www.freshports.org/security/gnupg/" + openbsd="http://openports.se/security/gnupg" + netbsd="http://pkgsrc.se/security/gnupg" + mac="https://gpgtools.org/" + fdroid="https://f-droid.org/app/org.sufficientlysecure.keychain" + googleplay="https://play.google.com/store/apps/details?id=org.sufficientlysecure.keychain" +%} - {% include card.html color="warning" +{% + include cardv2.html title="PeaZip - File Archive Encryption" image="/assets/img/tools/PeaZip.png" - url="http://www.peazip.org/" - footer="OS: Windows, Linux, BSD." - description="PeaZip is a free and open-source file manager and file archiver made by Giorgio Tani. It supports its native PEA archive format (featuring compression, multi volume - split and flexible authenticated encryption and integrity check schemes) and other mainstream formats, with special focus on handling open formats. It supports 181 file extensions (as of version 5.5.1).

    -

    macOS alternative: Keka is a free file archiver." - %} - -

    + description="PeaZip is a free and open-source file manager and file archiver made by Giorgio Tani. It supports its native PEA archive format (featuring compression, multi volume split and flexible authenticated encryption and integrity check schemes) and other mainstream formats, with special focus on handling open formats. It supports 180+ archive formats." + website="http://www.peazip.org" + forum="https://forum.privacytools.io/t/discussion-peazip-file-encryption/1534" + source="https://osdn.net/projects/peazip" + windows="https://www.peazip.org/peazip-64bit.html" + linux="https://www.peazip.org/peazip-linux.html" + freebsd="https://www.freshports.org/archivers/peazip/" + openbsd="https://www.peazip.org/peazip-bsd.html" + netbsd="https://www.peazip.org/peazip-bsd.html" +%}

    Worth Mentioning

    diff --git a/_includes/sections/file-sharing.html b/_includes/sections/file-sharing.html index 3e56763e..a4b5dff9 100644 --- a/_includes/sections/file-sharing.html +++ b/_includes/sections/file-sharing.html @@ -7,8 +7,8 @@ website="https://send.firefox.com/" description="Send uses end-to-end encryption to keep your data secure from the moment you share to the moment your file is opened. It also offers security controls that you can set. You can choose when your file link expires, the number of downloads, and whether to add an optional password for an extra layer of security." forum="https://forum.privacytools.io/t/discussion-firefox-send/755" github="https://github.com/mozilla/send" -web="" -android="" +web="https://send.firefox.com/" +googleplay="https://play.google.com/store/apps/details?id=org.mozilla.firefoxsend" %} {% include cardv2.html @@ -19,21 +19,26 @@ tor="http://elx57ue5uyfplgva.onion/" description="OnionShare is an open source tool that lets you securely and anonymously share a file of any size. It works by starting a web server, making it accessible as a Tor onion service, and generating an unguessable URL to access and download the files." forum="https://forum.privacytools.io/t/discussion-onionshare/754" github="https://github.com/micahflee/onionshare" -windows="" -mac="" -linux="" +windows="https://onionshare.org/#downloads" +mac="https://onionshare.org/#downloads" +linux="https://onionshare.org/#downloads" +freebsd="https://www.freshports.org/www/onionshare/" +openbsd="http://openports.se/net/onionshare" %} {% include cardv2.html title="Magic Wormhole" image="/assets/img/tools/Magic-Wormhole.png" -website="https://github.com/warner/magic-wormhole" +website="https://magic-wormhole.readthedocs.io" description="Get things from one computer to another, safely. This package provides a library and a command-line tool named wormhole, which makes it possible to get arbitrary-sized files and directories (or short pieces of text) from one computer to another." forum="https://forum.privacytools.io/t/discussion-magic-wormhole/756" github="https://github.com/warner/magic-wormhole" -windows="" -mac="" -linux="" +windows="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation" +mac="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation" +linux="https://magic-wormhole.readthedocs.io/en/latest/welcome.html#installation" +freebsd="https://www.freshports.org/net/py-magic-wormhole/" +openbsd="https://pypi.org/project/magic-wormhole/" +netbsd="https://pypi.org/project/magic-wormhole/" %}

    Worth Mentioning

    diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html index 3da570dd..3ccab45c 100644 --- a/_includes/sections/instant-messenger.html +++ b/_includes/sections/instant-messenger.html @@ -1,7 +1,7 @@

    Encrypted Instant Messenger

    @@ -10,30 +10,35 @@ title="Signal" image="/assets/img/tools/Signal.png" description="Signal is a mobile app developed by Open Whisper Systems. The app provides instant messaging, as well as voice and video calling. All communications are end-to-end encrypted. Signal is free and open source." +labels="success:VoIP" website="https://signal.org/" forum="https://forum.privacytools.io/t/discussion-signal/664" github="https://github.com/signalapp" -android="" -ios="" -mac="" -windows="" -linux="" +playstore="https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms" +windows="https://signal.org/download/" +mac="https://signal.org/download/" +linux="https://signal.org/download/" +playstore="https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms" +android="https://signal.org/android/apk/#apk-danger" +ios="https://apps.apple.com/us/app/signal-private-messenger/id874139669" %} {% include cardv2.html title="Wire" image="/assets/img/tools/wire.png" -description='A free software End-to-End Encrypted chatting application that supports instant messaging, voice, and video calls. Full source code is available. Warning' +description="A free software End-to-End Encrypted chatting application that supports instant messaging, voice, and video calls. Full source code is available." +labels="warning:Warning:Wire stores some plaintext metadata about its users on their servers. This data includes profile names, profile pictures, usernames, and users' lists of connections and conversations.|success:VoIP" website="https://wire.com/" forum="https://forum.privacytools.io/t/discussion-wire/750" github="https://github.com/wireapp/" -android="" -ios="" -mac="" -windows="" -linux="" -web="" +windows="https://wire.com/en/download" +mac="https://wire.com/en/download" +linux="https://wire.com/en/download" +googleplay="https://play.google.com/store/apps/details?id=com.wire" +android="https://wire.com/en/download" +ios="https://itunes.apple.com/app/wire/id930944768?mt=8" +web="https://app.wire.com" %}

    Complete Comparison

    @@ -53,55 +58,27 @@ web=""
  • Kontalk - A community-driven instant messaging network. Supports end-to-end encryption. Both client-to-server and server-to-server channels are fully encrypted.
  • Keybase - Warning End-to-end encrypted messaging with social verification.
  • Status - Experimental A free and open-source, peer-to-peer, encrypted instant messanger with support for DAPPs.
    • -
  • Ricochet - Danger Experimental Ricochet uses the Tor network to reach your contacts without relying on messaging servers. It creates a hidden service, which is used to rendezvous with your contacts without revealing your location or IP address.
    • +
  • Tox - Experimental A free and open-source, peer-to-peer, encrypted instant messaging and video calling software. VoIP
    • +
  • Jami (formerly Ring/SFLphone) - Gives you full control over your communications and an unmatched level of privacy. Jami has text messaging, video and audio calls, file transfer, video conferencing. VoIP

    • Related Information

    - -

    Updating the Tor binary included with Ricochet

    - -Currently there are no known vulnerabilities with Ricochet. The software is safe to use as long as you update the included Tor binary to the latest version. - -
      -
    1. Download the Tor Browser.
      2. -
    2. Run the Tor Browser installer or extract package for your platform. Windows (.exe), MacOSX (.dmg) and Linux (.tar.bz2).
      3. -
    3. Copy the Tor binary or create a symbolic link to it:
      4. -
      -
    diff --git a/_includes/sections/live-operating-systems.html b/_includes/sections/live-operating-systems.html index 80450669..d718ece0 100644 --- a/_includes/sections/live-operating-systems.html +++ b/_includes/sections/live-operating-systems.html @@ -1,37 +1,38 @@

    Live CD Operating Systems

    -
    +{% include cardv2.html +title="Tails" +image="/assets/img/tools/Tails.png" +description='Tails is a live operating system, that starts on almost any computer from a DVD, USB stick, or SD card. It aims at preserving privacy and anonymity, and helps to: Use the Internet anonymously and circumvent censorship; Internet connections go through the Tor network; leave no trace on the computer; use state-of-the-art cryptographic tools to encrypt files, emails and instant messaging.' +badges="info:GNU/Linux" +labels="warning:contrib:This software may depend on or recommend non-free software." +website="https://tails.boum.org/" +git="https://git-tails.immerda.ch/tails/" +%} - {% include card.html color="success" - title="Tails" - labels="warning:contrib:This software may depend on or recommend non-free software." - image="/assets/img/tools/Tails.png" - url="https://tails.boum.org/" - description="Tails is a live operating system, that starts on almost any computer from a DVD, USB stick, or SD card. It aims at preserving privacy and anonymity, and helps to: Use the Internet anonymously and circumvent censorship; Internet connections go through the Tor network; leave no trace on the computer; use state-of-the-art cryptographic tools to encrypt files, emails and instant messaging." - %} +{% include cardv2.html +title="KNOPPIX" +image="/assets/img/tools/KNOPPIX.png" +description='Knoppix is an operating system based on Debian designed to be run directly from a CD / DVD (Live CD) or a USB flash drive (Live USB), one of the first of its kind for any operating system. When starting a program, it is loaded from the removable medium and decompressed into a RAM drive. The decompression is transparent and on-the-fly.' +badges="info:GNU/Linux" +labels="warning:contrib:This software may depend on or recommend non-free software." +website="https://www.knopper.net/knoppix/index-en.html" +source="https://www.knopper.net/knoppix-info/index-en.html#license" +%} - {% include card.html color="primary" - title="KNOPPIX" - labels="warning:contrib:This software may depend on or recommend non-free software." - image="/assets/img/tools/KNOPPIX.png" - url="https://www.knopper.net/knoppix/" - website="knopper.net" - description="Knoppix is an operating system based on Debian designed to be run directly from a CD / DVD (Live CD) or a USB flash drive (Live USB), one of the first of its kind for any operating system. When starting a program, it is loaded from the removable medium and decompressed into a RAM drive. The decompression is transparent and on-the-fly." - %} - - {% include card.html color="warning" - title="Puppy Linux" - labels="warning:contrib:This software may depend on or recommend non-free software." - image="/assets/img/tools/Puppy-Linux.png" - url="http://puppylinux.org/" - description="Puppy Linux operating system is a lightweight Linux distribution that focuses on ease of use and minimal memory footprint. The entire system can be run from RAM with current versions generally taking up about 210 MB, allowing the boot medium to be removed after the operating system has started." - %} - -
    +{% include cardv2.html +title="Puppy Linux" +image="/assets/img/tools/Puppy-Linux.png" +description='Puppy Linux operating system is a lightweight Linux distribution that focuses on ease of use and minimal memory footprint. The entire system can be run from RAM with current versions generally taking up about 210 MB, allowing the boot medium to be removed after the operating system has started.' +badges="info:GNU/Linux" +labels="warning:contrib:This software may depend on or recommend non-free software." +website="http://puppylinux.org/" +source="http://distro.ibiblio.org/puppylinux/" +%}

    Worth Mentioning

    diff --git a/_includes/sections/mobile-operating-systems.html b/_includes/sections/mobile-operating-systems.html index 3884ba7f..ebe47849 100644 --- a/_includes/sections/mobile-operating-systems.html +++ b/_includes/sections/mobile-operating-systems.html @@ -4,38 +4,40 @@ Even though the source code of the following OS is provided, installing Google Apps may compromise your setup. -
    +{% include cardv2.html +title="GrapheneOS" +image="/assets/img/tools/GrapheneOS.png" +description='GrapheneOS (formerly known as CopperheadOS) is a free and open-source security and privacy focused mobile operating system built on top of the Android Open Source Project. It currently specifically targets devices offering strong hardware security.' +badges="info:AOSP" +labels="warning:contrib:This software may depend on or recommend non-free software." +website="https://grapheneos.org/" +github="https://github.com/GrapheneOS/" +%} - {% include card.html color="success" - title="LineageOS" - labels="warning:contrib:This software may depend on or recommend non-free software." - image="/assets/img/tools/LineageOS.png" - url="https://www.lineageos.org/" - description="LineageOS is a free and open-source operating system for smartphones and tablets, based on the official releases of the Android Open Source Project. It is the continuation of the CyanogenMod project." - %} +{% include cardv2.html +title="LineageOS" +image="/assets/img/tools/LineageOS.png" +description='LineageOS is a free and open-source operating system for smartphones and tablets, based on the official releases of the Android Open Source Project. It is the continuation of the CyanogenMod project.' +badges="info:AOSP" +labels="warning:contrib:This software may depend on or recommend non-free software." +website="https://www.lineageos.org/" +github="https://github.com/LineageOS" +%} - {% include card.html color="primary" - title="Ubuntu Touch" - labels="warning:contrib:This software may depend on or recommend non-free software." - image="/assets/img/tools/Ubuntu-Touch.png" - url="https://ubuntu-touch.io/" - description="Ubuntu Touch is a free and open-source operating system for smartphones and tablets. It's an alternative to the current popular mobile operating systems on the market. Only a few devices are supported." - %} - - {% include card.html color="warning" - title="GrapheneOS" - labels="warning:contrib:This software may depend on or recommend non-free software." - image="/assets/img/tools/GrapheneOS.png" - url="https://grapheneos.org/" - description="GrapheneOS is a free and open-source security and privacy focused mobile operating system built on top of the Android Open Source Project. It currently specifically targets devices offering strong hardware security." - %} - -
    +{% include cardv2.html +title="Ubuntu Touch" +image="/assets/img/tools/Ubuntu-Touch.png" +description="Ubuntu Touch is a free and open-source operating system for smartphones and tablets. It's an alternative to the current popular mobile operating systems on the market. Only a few devices are supported." +badges="info:GNU/Linux" +labels="warning:contrib:This software may depend on or recommend non-free software." +website="https://ubuntu-touch.io/" +github="https://github.com/ubports" +%}

    Worth Mentioning

    diff --git a/_includes/sections/notebooks.html b/_includes/sections/notebooks.html index 1e0021a1..e6cd694a 100644 --- a/_includes/sections/notebooks.html +++ b/_includes/sections/notebooks.html @@ -10,13 +10,15 @@ image="/assets/img/tools/Joplin.png" description="Joplin is a free, open source, fully featured note taking and to-do application, which can handle a large number of markdown notes organized into notebooks and tags. It offers E2EE encryption and can sync through Nextcloud, Dropbox and more. It also offers easy import from Evernote and plain text notes." website="https://joplinapp.org/" github="https://github.com/laurent22/joplin" -windows="" -mac="" -linux="" -ios="" -android="" -firefox="" -chrome="" +windows="https://joplinapp.org/#desktop-applications" +mac="https://joplinapp.org/#desktop-applications" +linux="https://joplinapp.org/#desktop-applications" +freebsd="https://www.npmjs.com/package/joplin" +googleplay="https://joplinapp.org/images/BadgeAndroid.png" +android="https://joplinapp.org/#mobile-applications" +ios="https://itunes.apple.com/us/app/joplin/id1315599797" +firefox="https://addons.mozilla.org/en-US/firefox/addon/joplin-web-clipper/" +chrome="https://chrome.google.com/webstore/detail/joplin-web-clipper/alofnhikmmkdbbbgpnglcpdollgjjfek" %} {% include cardv2.html @@ -25,12 +27,13 @@ image="/assets/img/tools/StandardNotes.png" description="Standard Notes is a simple and private notes app that makes your notes easy and available everywhere you are. Features end-to-end encryption on every platform, and a powerful desktop experience with themes and custom editors." website="https://standardnotes.org/" github="https://github.com/standardnotes" -windows="" -mac="" -linux="" -ios="" -android="" -web="" +windows="https://standardnotes.org/#get-started" +mac="https://standardnotes.org/#get-started" +linux="https://standardnotes.org/#get-started" +ios="https://itunes.apple.com/us/app/standard-notes/id1285392450" +fdroid="https://f-droid.org/packages/com.standardnotes/" +googleplay="https://play.google.com/store/apps/details?id=com.standardnotes" +web="https://app.standardnotes.org/" %} {% include cardv2.html @@ -39,10 +42,13 @@ image="/assets/img/tools/Turtl.png" description="Turtl lets you take notes, bookmark websites, and store documents for sensitive projects. From sharing passwords with your coworkers to tracking research on an article you're writing, Turtl keeps it all safe from everyone but you and those you share with." website="https://turtlapp.com/" github="https://github.com/turtl" -windows="" -mac="" -linux="" -android="" +windows="https://turtlapp.com/download/" +mac="https://turtlapp.com/download/" +linux="https://turtlapp.com/download/" +googleplay="https://play.google.com/store/apps/details?id=com.lyonbros.turtl" +android="https://turtlapp.com/download/" +firefox="https://addons.mozilla.org/en-US/firefox/addon/turtl-bookmarking/" +chrome="https://chrome.google.com/webstore/detail/turtl/dgcojenhfdjhieoglmiaheihjadlpcml" %}

    Warning

    diff --git a/_includes/sections/operating-systems.html b/_includes/sections/operating-systems.html index da18fc15..945b434d 100644 --- a/_includes/sections/operating-systems.html +++ b/_includes/sections/operating-systems.html @@ -1,36 +1,39 @@

    PC Operating Systems

    -
    +{% include cardv2.html +title="Qubes OS" +image="/assets/img/tools/Qubes-OS.png" +description='Qubes is an open-source operating system designed to provide strong security for desktop computing. Qubes is based on Xen, the X Window System, and Linux, and can run most Linux applications and utilize most of the Linux drivers.' +badges="info:Xen" +labels="warning:contrib:This software may depend on or recommend non-free software." +website="https://www.qubes-os.org/" +github="https://github.com/QubesOS" +tor="http://qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/" +%} - {% include card.html color="success" - title="Qubes OS" - labels="warning:contrib:This software may depend on or recommend non-free software." - image="/assets/img/tools/Qubes-OS.png" - url="https://www.qubes-os.org/" - tor="http://qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/" - description="Qubes is an open-source operating system designed to provide strong security for desktop computing. Qubes is based on Xen, the X Window System, and Linux, and can run most Linux applications and utilize most of the Linux drivers." - %} +{% include cardv2.html +title="Fedora Workstation" +image="/assets/img/tools/Fedora.png" +description='Fedora is a Linux distribution developed by the Fedora Project and sponsored by Red Hat. Fedora Workstation is a secure, reliable, and user-friendly edition developed for desktops and laptops, using GNOME as the default desktop environment.' +badges="info:GNU/Linux" +labels="warning:contrib:This software may depend on or recommend non-free software." +website="https://getfedora.org/" +git="https://src.fedoraproject.org/" +%} - {% include card.html color="primary" - title="Debian" - image="/assets/img/tools/Debian.png" - url="https://www.debian.org/" - tor="http://sejnfjrq6szgca7v.onion" - description="Debian is a Unix-like computer operating system and a Linux distribution that is composed entirely of free and open-source software, most of which is under the GNU General Public License, and packaged by a group of individuals known as the Debian project." - %} - - {% include card.html color="warning" - title="Trisquel" - image="/assets/img/tools/Trisquel.png" - url="https://trisquel.info/" - description="Trisquel is a Linux-based operating system derived from Ubuntu. The project aims for a fully free software system without proprietary software or firmware and uses Linux-libre, a version of the Linux kernel with the non-free code (binary blobs) removed." - %} - -
    +{% include cardv2.html +title="Debian" +image="/assets/img/tools/Debian.png" +description='Debian is a Unix-like computer operating system and a Linux distribution that is composed entirely of free and open-source software, most of which is under the GNU General Public License, and packaged by a group of individuals known as the Debian project.' +badges="info:GNU/Linux" +website="https://www.debian.org/" +tor="http://sejnfjrq6szgca7v.onion" +gitlab="https://salsa.debian.org/qa/debsources" +%}

    Warning

    @@ -38,12 +41,40 @@
  • Don't use Windows 10 - It's a privacy nightmare
    • +

    Remember to check CPU vulnerability mitigations

    + +

    This also affects Windows 10, but it doesn't expose this information or mitigation instructions as easily. MacOS users check How to enable full mitigation for Microarchitectural Data Sampling (MDS) vulnerabilities on Apple Support.

    + +

    When running a enough recent kernel, you can check the CPU vulnerabilities it detects by tail -n +1 /sys/devices/system/cpu/vulnerabilities/*. By using tail -n +1 instead of cat, the file names are also visible.

    + +

    + In case you have an Intel CPU, you may notice "SMT vulnerable" display after running the tail command. To mitigate this, disable hyper-threading from the UEFI/BIOS. You can also take the following mitigation steps below if your system/distribution uses GRUB and supports /etc/default/grub.d/: +

    + +
      +
    1. sudo mkdir /etc/default/grub.d/ to create a directory for additional grub configuration
      2. +
    2. echo GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT mds=full,nosmt" | sudo tee /etc/default/grub.d/mds.conf to create a new grub config file source with the echoed content
      3. +
    3. sudo grub-mkconfig -o /boot/grub/grub.cfg to generate a new grub config file including this new kernel boot flag
      4. +
    4. sudo reboot to reboot
      5. +
    5. after the reboot, check tail -n +1 /sys/devices/system/cpu/vulnerabilities/* again to see that MDS now says "SMT disabled."
      6. +
    + +
    Further reading
    + + +

    Worth Mentioning

    diff --git a/_includes/sections/password-managers.html b/_includes/sections/password-managers.html index 57624ed7..aac8d968 100644 --- a/_includes/sections/password-managers.html +++ b/_includes/sections/password-managers.html @@ -1,52 +1,85 @@

    Password Manager Software

    -
    - - {% include card.html color="success" +{% + include cardv2.html title="Bitwarden - Cloud/Self-host" image="/assets/img/tools/bitwarden.png" - url="https://bitwarden.com/" - footer="OS: Windows, macOS, Linux, iOS, Android, Web." - description="Bitwarden is a free and open source password manager. It aims to solve password management problems for individuals, teams, and business organizations. Bitwarden is among the easiest and safest solutions to store all of your logins and passwords while conveniently keeping them synced between all of your devices. If you don't want to use the Bitwarden cloud, you can easily host your own Bitwarden server." - %} + description="Bitwarden is a free and open source password manager. It aims to solve password management problems for individuals, teams, and business organizations. Bitwarden is among the easiest and safest solutions to store all of your logins and passwords while conveniently keeping them synced between all of your devices. If you don't want to use the Bitwarden cloud, you can easily host your own Bitwarden server." + website="https://bitwarden.com/" + forum="https://forum.privacytools.io/t/discussion-bitwarden/1343" + github="https://github.com/bitwarden" + web="https://vault.bitwarden.com/#/" + windows="https://bitwarden.com/#download" + linux="https://bitwarden.com/#download" + freebsd="https://www.npmjs.com/package/@bitwarden/cli" + openbsd="https://www.npmjs.com/package/@bitwarden/cli" + netbsd="https://www.npmjs.com/package/@bitwarden/cli" + mac="https://bitwarden.com/#download" + firefox="https://addons.mozilla.org/firefox/addon/bitwarden-password-manager/" + chrome="https://chrome.google.com/webstore/detail/bitwarden-free-password-m/nngceckbapebfimnlniiiahkandclblb" + safari="https://safari-extensions.apple.com/details/?id=com.bitwarden.safari-LTZ2PFU5D6" + opera="https://addons.opera.com/extensions/details/bitwarden-free-password-manager/" + edge="https://www.microsoft.com/store/apps/9P6KXL0SVNNL" + fdroid="https://mobileapp.bitwarden.com/fdroid/" + googleplay="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden" + ios="https://itunes.apple.com/app/bitwarden-free-password-manager/id1137397744?mt=8" +%} - {% include card.html color="primary" - title="KeePass / KeePassXC - Local" - image="/assets/img/tools/KeePass.png" - url="https://keepass.info/download.html" - website="keepass.info" - footer="OS: Windows, macOS, Linux, iOS, Android, BSD." - description='KeePass is a free open source password manager, which helps you to manage your passwords in a secure way. All passwords in one database, which is locked with one - master key or a key file. The databases are encrypted using the best and most secure encryption algorithms currently known: AES and Twofish. See also: KeePassXC with official native cross-platform support for Windows/macOS/Linux.' - %} - {% include card.html color="warning" +{% + include cardv2.html + title="KeePassXC - Local" + image="/assets/img/tools/keepassxc.png" + description="KeePassXC is a community fork of KeePassX, a native cross-platform port of KeePass Password Safe, with the goal to extend and improve it with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager." + website="https://keepassxc.org/" + forum="https://forum.privacytools.io/t/discussion-keepassxc/1344/2" + github="https://github.com/keepassxreboot/keepassxc" + windows="https://keepassxc.org/download/#windows" + linux="https://keepassxc.org/download/#linux" + mac="https://keepassxc.org/download/#mac" + freebsd="https://www.freshports.org/security/keepassxc/" + openbsd="http://openports.se/security/keepassxc" + netbsd="http://pkgsrc.se/security/keepassxc" + fdroid="https://f-droid.org/packages/com.kunzisoft.keepass.libre/" + googleplay="https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.free" + firefox="https://addons.mozilla.org/en-US/firefox/addon/keepassxc-browser" + chrome="https://chrome.google.com/webstore/detail/keepassxc-browser/oboonakemofpalcgghocfoadofidjkkk" +%} + +{% + include cardv2.html title="LessPass - Browser" image="/assets/img/tools/LessPass.png" - url="https://lesspass.com/" - footer="OS: Windows, macOS, Linux, Android." - description="LessPass is a free and open source password manager that generates unique passwords for websites, email accounts, or anything else based on a master password and information you know. No sync needed. Uses PBKDF2 and SHA-256. It's advised to use the browser addons for more security." - %} - -
    + description="LessPass is a free and open source password manager that generates unique passwords for websites, email accounts, or anything else based on a master password and information you know. No sync needed. Uses PBKDF2 and SHA-256. It's advised to use the browser addons for more security." + website="https://lesspass.com/" + forum="https://forum.privacytools.io/t/discussion-keepassxc/1344/2" + github="https://github.com/lesspass/lesspass" + windows="https://pypi.org/project/lesspass/" + mac="https://pypi.org/project/lesspass/" + linux="https://pypi.org/project/lesspass/" + freebsd="https://pypi.org/project/lesspass/" + firefox="https://addons.mozilla.org/en-US/firefox/addon/lesspass/" + chrome="https://chrome.google.com/webstore/detail/lesspass/lcmbpoclaodbgkbjafnkbbinogcbnjih" + fdroid="https://f-droid.org/packages/com.lesspass.android" + googleplay="https://play.google.com/store/apps/details?id=com.lesspass.android" +%}

    Worth Mentioning

    diff --git a/_includes/sections/paste-services.html b/_includes/sections/paste-services.html index 788d8210..3cb3b676 100644 --- a/_includes/sections/paste-services.html +++ b/_includes/sections/paste-services.html @@ -4,7 +4,7 @@ title="PrivateBin" image="/assets/img/tools/PrivateBin.png" description="PrivateBin is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted in the browser using 256bit AES. It is the improved version of ZeroBin." -website="https://bin.privacytools.io/" +website="https://privatebin.info/" forum="https://forum.privacytools.io/t/discussion-privatebin/296" github="https://github.com/PrivateBin/PrivateBin" %} diff --git a/_includes/sections/privacy-resources.html b/_includes/sections/privacy-resources.html index e4340e80..fc4009a6 100644 --- a/_includes/sections/privacy-resources.html +++ b/_includes/sections/privacy-resources.html @@ -14,14 +14,15 @@

    Information

    Tools

    @@ -35,7 +36,6 @@ by the late Aaron Swartz and is currently managed by Freedom of the Press Foundation.
  • Reset The Net - Privacy Pack - Help fight to end mass surveillance. Get these tools to protect yourself and your friends.
  • Security First - Umbrella is an Android app that provides all the advice needed to operate safely in a hostile environment.
    • -
  • Block Cloudflare MiTM Attack - Firefox add-on to detect and block Cloudflare MITM attack.
  • Osalt - A directory to help you find open source alternatives to proprietary tools.
  • AlternativeTo - A directory to help find alternatives to other software, with the option to only show open source software
    • diff --git a/_includes/sections/productivity-tools.html b/_includes/sections/productivity-tools.html index 01c36154..9f9e2004 100644 --- a/_includes/sections/productivity-tools.html +++ b/_includes/sections/productivity-tools.html @@ -1,34 +1,73 @@

    Productivity Tools

    -
    +{% + include cardv2.html + title="CryptPad" + image="/assets/img/provider/CryptPad.png" + description="CryptPad is a private-by-design alternative to popular office tools and cloud services. All content is end-to-end encrypted. It is free and open source, enabling anyone to verify its security by auditing the code. The development team is supported by donations and grants. No registration is required, and it can be used anonymously via Tor Browser." + website="https://cryptpad.fr/" + forum="https://forum.privacytools.io/t/discussion-cryptpad-productivity-tools/1537" + github="https://github.com/xwiki-labs/cryptpad" + web="https://cryptpad.fr/" +%} - {% include card.html color="success" - title="CryptPad" - image="/assets/img/provider/CryptPad.png" - - description="CryptPad is a private-by-design alternative to popular office tools and cloud services. All content is end-to-end encrypted. It is free and open source, enabling anyone to verify its security by auditing the code. The development team is supported by donations and grants. No registration is required, and it can be used anonymously via Tor browser." - - url="https://cryptpad.fr/" - footer='OS: Linux, macOS, Windows, Web.' - %} - - {% include card.html color="primary" +{% + include cardv2.html title="Etherpad" image="/assets/img/tools/Etherpad.png" - url="https://etherpad.org/" - footer="OS: Windows, macOS, Linux." - description="Etherpad is a highly customizable Open Source online editor providing collaborative editing in really real-time. Etherpad allows you to edit documents collaboratively in real-time, much like a live multi-player editor that runs in your browser. Write articles, press releases, to-do lists, etc. Sites That Run Etherpad" - %} + description="Etherpad is a highly customizable open source online editor providing collaborative editing in real-time. Here are a list of sites that run Etherpad." + website="https://etherpad.org/" + forum="https://forum.privacytools.io/t/discussion-etherpad-productivity-tools/1538" + github="https://github.com/ether/etherpad-lite" + web="https://github.com/ether/etherpad-lite/wiki/Sites-that-run-Etherpad" + windows="https://github.com/ether/etherpad-lite#windows" + linux="https://github.com/ether/etherpad-lite#installation" + mac="https://github.com/ether/etherpad-lite#gnulinux-and-other-unix-like-systems" + freebsd="https://github.com/ether/etherpad-lite#gnulinux-and-other-unix-like-systems" + openbsd="https://github.com/ether/etherpad-lite#gnulinux-and-other-unix-like-systems" + netbsd="https://github.com/ether/etherpad-lite#gnulinux-and-other-unix-like-systems" +%} - {% include card.html color="warning" +{% + include cardv2.html title="Write.as" image="/assets/img/tools/WriteAs.png" - url="https://write.as/" + description="Write.as is a cross-platform, privacy-oriented blogging platform. It's anonymous by default, letting you publish without signing up. If you create an account, it doesn't require any personal information. No ads, distraction-free, and built on a sustainable business model." + website="https://write.as/" + forum="https://forum.privacytools.io/t/discussion-write-as-productivity-tools/1539" tor="http://writeas7pm7rcdqg.onion" - footer="OS: Windows, macOS, Linux, Android, iOS, Chrome OS, Web." - description="Write.as is a cross-platform, privacy-oriented blogging platform. It's anonymous by default, letting you publish without signing up. If you create an account, it doesn't require any personal information. No ads, distraction-free, and built on a sustainable business model." - %} + git="https://code.as/writeas" + web="https://write.as/pad" + windows="https://github.com/writeas/writeas-cli" + mac="https://github.com/writeas/writeas-cli" + linux="https://write.as/apps" + chrome="https://write.as/apps" + googleplay="https://play.google.com/store/apps/details?id=com.abunchtell.writeas" + ios="https://itunes.apple.com/app/apple-store/id1000755153" +%} +

    + + Metadata Removal Tools +

    + +
    +{% + include cardv2.html + title="MAT2" + image="/assets/img/tools/MAT2.png" + description="MAT2 is free software, which allows the removal of metadata of image, audio, torrent, and document file types. It provides both a command line tool and a graphical user interface via an extension for Nautilus, the default file manager of GNOME." + website="https://0xacab.org/jvoisin/mat2" + forum="https://forum.privacytools.io/t/discussion-mat/1559" + gitlab="https://0xacab.org/jvoisin/mat2" + windows="https://pypi.org/project/mat2/" + mac="https://pypi.org/project/mat2/" + linux="https://pypi.org/project/mat2/" + freebsd="https://pypi.org/project/mat2/" + openbsd="https://pypi.org/project/mat2/" + netbsd="https://pypi.org/project/mat2/" +%}

    Worth Mentioning

    @@ -36,8 +75,9 @@ diff --git a/_includes/sections/router-firmware.html b/_includes/sections/router-firmware.html index 40395a7d..1f785d5e 100644 --- a/_includes/sections/router-firmware.html +++ b/_includes/sections/router-firmware.html @@ -1,35 +1,37 @@

    Open Source Router Firmware

    -
    +{% include cardv2.html +title="OpenWrt" +image="/assets/img/tools/OpenWrt.png" +description="OpenWrt is an operating system (in particular, an embedded operating system) based on the Linux kernel, primarily used on embedded devices to route network traffic. The main components are the Linux kernel, util-linux, uClibc and BusyBox. All components have been optimized for size, to be small enough for fitting into the limited storage and memory available in home routers." +badges="info:Linux" +labels="warning:contrib:This software may depend on or recommend non-free software." +website="https://openwrt.org/" +git="https://git.openwrt.org/" +%} - {% include card.html color="success" - title="OpenWrt" - labels="warning:contrib:This software may depend on or recommend non-free software." - image="/assets/img/tools/OpenWrt.png" - url="https://openwrt.org/" - description="OpenWrt is an operating system (in particular, an embedded operating system) based on the Linux kernel, primarily used on embedded devices to route network traffic. The main components are the Linux kernel, util-linux, uClibc and BusyBox. All components have been optimized for size, to be small enough for fitting into the limited storage and memory available in home routers." - %} +{% include cardv2.html +title="pfSense" +image="/assets/img/tools/pfSense.png" +description="pfSense is an open source firewall/router computer software distribution based on FreeBSD. It is installed on a computer to make a dedicated firewall/router for a network and is noted for its reliability and offering features often only found in expensive commercial firewalls. pfSense is commonly deployed as a perimeter firewall, router, wireless access point, DHCP server, DNS server, and as a VPN endpoint." +badges="info:BSD" +labels="warning:contrib:This software may depend on or recommend non-free software." +website="https://www.pfsense.org/" +github="https://github.com/pfsense/" +%} - {% include card.html color="primary" - title="pfSense" - labels="warning:contrib:This software may depend on or recommend non-free software." - image="/assets/img/tools/pfSense.png" - url="https://www.pfsense.org/" - description="pfSense is an open source firewall/router computer software distribution based on FreeBSD. It is installed on a computer to make a dedicated firewall/router for a network and is noted for its reliability and offering features often only found in expensive commercial firewalls. pfSense is commonly deployed as a perimeter firewall, router, wireless access point, DHCP server, DNS server, and as a VPN endpoint." - %} - - {% include card.html color="warning" - title="LibreCMC" - image="/assets/img/tools/LibreCMC.png" - url="https://librecmc.org" - description="LibreCMC is a GNU/Linux-libre distribution for computers with minimal resources, such as the Ben Nanonote, ath9k-based Wi-Fi routers, and other hardware with emphasis on free software. The project's current goal is to aim for compliance with the GNU Free System Distribution Guidelines (GNU FSDG) and ensure that the project continues to meet these requirements set forth by the Free Software Foundation (FSF).." - %} - -
    +{% include cardv2.html +title="LibreCMC" +image="/assets/img/tools/LibreCMC.png" +description="LibreCMC is a GNU/Linux-libre distribution for computers with minimal resources, such as the Ben Nanonote, ath9k-based Wi-Fi routers, and other hardware with emphasis on free software. The project's current goal is to aim for compliance with the GNU Free System Distribution Guidelines (GNU FSDG) and ensure that the project continues to meet these requirements set forth by the Free Software Foundation (FSF)." +badges="info:GNU/Linux" +website="https://librecmc.org" +git="https://gogs.librecmc.org/libreCMC/libreCMC" +%}

    Worth Mentioning

    diff --git a/_includes/sections/search-engines.html b/_includes/sections/search-engines.html index 37e49982..d28f3f02 100644 --- a/_includes/sections/search-engines.html +++ b/_includes/sections/search-engines.html @@ -6,7 +6,7 @@ {% include cardv2.html title="searx - Decentral" -image="/assets/img/provider/searx.jpg" +image="/assets/img/provider/searx.png" description='An open source metasearch engine, aggregating the results of other search engines while not storing information about its users. No logs, no ads and no tracking. List of Instances or try search.privacytools.io' website="https://searx.me/" tor="http://ulrn6sryqaifefld.onion" @@ -24,7 +24,7 @@ forum="https://forum.privacytools.io/t/discussion-startpage/284" {% include cardv2.html title="DuckDuckGo - USA" -image="/assets/img/provider/DuckDuckGo.jpg" +image="/assets/img/provider/DuckDuckGo.png" description='The search engine that doesn\'t track you. Some of DuckDuckGo\'s code is free software hosted at GitHub, but the core is proprietary. The company is based in the USA.' website="https://duckduckgo.com/" tor="http://3g2upl4pq6kufc4m.onion" @@ -34,7 +34,7 @@ github="https://github.com/duckduckgo" {% include cardv2.html title="Qwant - France" -image="/assets/img/provider/qwant.jpg" +image="/assets/img/provider/Qwant.png" description='Qwants philosophy is based on two principles: no user tracking and no filter bubble. Qwant was launched in France in February 2013. Privacy Policy.' website="https://www.qwant.com/" forum="https://forum.privacytools.io/t/discussion-qwant/286" diff --git a/_includes/sections/social-networks.html b/_includes/sections/social-networks.html index 8acac077..30718d58 100644 --- a/_includes/sections/social-networks.html +++ b/_includes/sections/social-networks.html @@ -11,9 +11,16 @@ description='Mastodon is a social network based on open web protocols and free, website="https://joinmastodon.org/" forum="https://forum.privacytools.io/t/discussion-mastodon/289" github="https://github.com/tootsuite/mastodon" -android="" -ios="" -web="" +windows="https://joinmastodon.org/apps" +mac="https://joinmastodon.org/apps" +linux="https://joinmastodon.org/apps" +freebsd="https://joinmastodon.org/apps" +openbsd="https://joinmastodon.org/apps" +netbsd="https://joinmastodon.org/apps" +android="https://joinmastodon.org/apps" +sailfish="https://joinmastodon.org/apps" +ios="https://joinmastodon.org/apps" +web="https://joinmastodon.org/#getting-started" %} {% include cardv2.html @@ -23,8 +30,8 @@ description="diaspora* is based on three key philosophies: Decentralization, fre website="https://diasporafoundation.org/" forum="https://forum.privacytools.io/t/discussion-diaspora/290" github="https://github.com/diaspora/diaspora" -android="" -web="" +android="https://wiki.diasporafoundation.org/Tools_to_use_with_Diaspora#Android" +web="https://diasporafoundation.org/" %} {% include cardv2.html @@ -34,20 +41,21 @@ description="Friendica has an emphasis on extensive privacy settings and easy se website="https://friendi.ca/" forum="https://forum.privacytools.io/t/discussion-friendica/291" github="https://github.com/friendica/friendica" -windows="" -linux="" -android="" -web="" +windows="https://friendi.ca/resources/mobile-clients/" +linux="https://friendi.ca/resources/mobile-clients/" +android="https://friendi.ca/resources/mobile-clients/" +sailfish="https://friendi.ca/resources/mobile-clients/" +web="https://friendi.ca/" %} {% include cardv2.html title="PixelFed - Instagram Alternative" image="/assets/img/provider/pixelfed.png" description='A free and ethical photo sharing platform, powered by ActivityPub federation. Pixelfed is an open-source, federated platform. You can run your own instance or join one.' -website="https://pixelfed.social/" +website="https://pixelfed.org/" forum="https://forum.privacytools.io/t/discussion-pixelfed/293" github="https://github.com/pixelfed" -web="" +web="https://pixelfed.org/" %} {% include cardv2.html @@ -56,12 +64,8 @@ image="/assets/img/provider/gnu-social.png" description="A social communication software for both public and private communications. It is widely supported and has a large userbase. It is already used by the Free Software Foundation." website="https://gnu.io/social/" forum="https://forum.privacytools.io/t/discussion-gnu-social/292" -github="https://github.com/foocorp/gnu-social" -android="" -ios="" -linux="" -windows="" -web="" +gitlab="https://git.gnu.io/gnu/gnu-social/" +web="https://gnu.io/social/" %}

    Worth Mentioning

    diff --git a/_includes/sections/social-news-aggregator.html b/_includes/sections/social-news-aggregator.html index 753727a9..20969791 100644 --- a/_includes/sections/social-news-aggregator.html +++ b/_includes/sections/social-news-aggregator.html @@ -8,15 +8,12 @@ title="Aether" image="/assets/img/tools/aether.png" description='Free/libre and open source decentralized social news aggregator with a built in voting system.' -website="https://github.com/nehbit/aether" +website="https://getaether.net/" forum="https://forum.privacytools.io/t/discussion-aether/1256" github="https://github.com/nehbit/aether" -windows="" -mac="" -linux="" -android="" -ios="" -bsd="" +windows="https://getaether.net/download/" +mac="https://getaether.net/download/" +linux="https://getaether.net/download/" %} {% include cardv2.html @@ -25,13 +22,8 @@ image="/assets/img/tools/tildes.png" description='Tildes is a web-based self-hostable online bulletin board. It is licensed under GPL 3.0.' website="https://tildes.net" forum="https://forum.privacytools.io/t/discussion-tildes/1257" -git="https://gitlab.com/tildes/" -windows="" -mac="" -linux="" -android="" -ios="" -bsd="" +gitlab="https://gitlab.com/tildes/tildes" +web="https://tildes.net" %} {% include cardv2.html @@ -40,12 +32,8 @@ image="/assets/img/tools/raddle.png" description="Raddle is a public Postmill instance focused on privacy and anti-censorship." website="https://raddle.me" forum="https://forum.privacytools.io/t/discussion-raddle/1258" -git="https://gitlab.com/postmill/" -windows="" -mac="" -linux="" -android="" -ios="" +gitlab="https://gitlab.com/postmill/" +web="https://raddle.me" %}

    Worth Mentioning

    diff --git a/_includes/sections/teamchat.html b/_includes/sections/teamchat.html index 7b6442cf..28649c53 100644 --- a/_includes/sections/teamchat.html +++ b/_includes/sections/teamchat.html @@ -1,41 +1,50 @@ -

    Team Chat Applications

    +

    Team Chat Platforms

    -{% include cardv2.html -title="Rocket.chat" -image="/assets/img/tools/rocket.chat.png" -description="Rocket.chat is an self-hostable open source platform for team communication. It has optional federation and experimental E2EE. Experimental " -website="https://rocket.chat/" -forum="https://forum.privacytools.io/t/discussion-rocket-chat/1223" -github="https://github.com/rocketchat/" -android="" -ios="" -mac="" -windows="" -linux="" +{% + include cardv2.html + title="Rocket.chat" + image="/assets/img/tools/rocket.chat.png" + description="Rocket.chat is an self-hostable open source platform for team communication. It has optional federation and experimental E2EE." + labels="warning:Experimental:Regarding E2EE their documentation states 'This feature is currently in alpha. It's also not yet supported on mobile'. There is no forward secrecy so compromised decryption password would leak all messages. The federation was also added afterwards potentially causing room for mistakes." + website="https://rocket.chat/" + forum="https://forum.privacytools.io/t/discussion-rocket-chat/1223" + github="https://github.com/rocketchat/" + windows="https://rocket.chat/install" + mac="https://itunes.apple.com/us/app/rocket-chat/id1086818840" + linux="https://rocket.chat/install" + fdroid="https://f-droid.org/packages/chat.rocket.android" + googleplay="https://play.google.com/store/apps/details?id=chat.rocket.android" + ios="https://itunes.apple.com/app/rocket-chat/id1148741252" %} -{% include cardv2.html -title="Keybase" -image="/assets/img/tools/keybase.png" -description='Keybase provides a hosted team chat with end-to-end encryption. It has also been indepedently audited (PDF). experimental (GitHub issue)' -website="https://keybase.io/" -forum="https://forum.privacytools.io/t/discussion-keybase/1224" -github="https://github.com/Keybase" -android="" -ios="" -mac="" -windows="" -linux="" -web="" +{% + include cardv2.html + title="Keybase" + image="/assets/img/tools/keybase.png" + description='Keybase provides a hosted team chat with end-to-end encryption. It has also been indepedently audited (PDF).' + labels="warning:Warning:The server side of Keybase runs on proprietary code and is centralized." + website="https://keybase.io/" + forum="https://forum.privacytools.io/t/discussion-keybase/1224" + tor="http://keybase5wmilwokqirssclfnsqrjdsi7jdir5wy7y7iu3tanwmtp6oid.onion/" + github="https://github.com/Keybase" + windows="https://keybase.io/docs/the_app/install_windows" + mac="https://keybase.io/docs/the_app/install_macos" + linux="https://keybase.io/docs/the_app/install_linux" + freebsd="https://www.freshports.org/security/keybase/" + googleplay="https://play.google.com/store/apps/details?id=io.keybase.ossifrage&hl=en_US" + ios="https://keybase.io/_/download/keybase-for-ios" + firefox="https://addons.mozilla.org/en-US/firefox/addon/keybase-for-firefox/" + chrome="https://chrome.google.com/webstore/detail/keybase-for-reddit/ognfafcpbkogffpmmdglhbjboeojlefj" + web="https://keybase.io/" %}

    Worth Mentioning

    diff --git a/_includes/sections/voice-video-messenger.html b/_includes/sections/voice-video-messenger.html index 2f5a0988..13252fe7 100644 --- a/_includes/sections/voice-video-messenger.html +++ b/_includes/sections/voice-video-messenger.html @@ -1,41 +1,9 @@ -

    Encrypted Video & Voice Messenger

    +

    Video/Voice Calling

    -{% include cardv2.html -title="Mobile: Signal" -image="/assets/img/tools/Signal.png" -website="https://signal.org" -description="Signal is a mobile app developed by Open Whisper Systems. The app provides instant messaging, as well as voice and video calling. -All communications are end-to-end encrypted. Signal is free and open source." -forum="https://forum.privacytools.io/t/discussion-signal/664" -github="https://github.com/signalapp" -android="" -ios="" -mac="" -windows="" -linux="" -footer="OS: Android, iOS, macOS, Windows, Linux" -%} - -{% include cardv2.html -title="Wire" -image="/assets/img/tools/wire.png" -website="https://wire.com/download/" -description="Wire is an app developed by Wire Swiss GmbH. -The Wire app allows users to exchange end-to-end encrypted instant messages, as well as make voice and video calls. Wire is free and open source. Caution " -forum="https://forum.privacytools.io/t/discussion-wire/750" -github="https://github.com/wireapp" -android="" -ios="" -mac="" -windows="" -linux="" -web="" -%} - {% include cardv2.html title="Linphone" image="/assets/img/tools/Linphone.png" @@ -43,28 +11,40 @@ website="https://www.linphone.org/" description="Linphone is an open source SIP Phone and a free voice over IP service, available on mobile and desktop environments and on web browsers. It supports ZRTP for end-to-end encrypted voice and video communication." forum="https://forum.privacytools.io/t/discussion-linphone/751" github="https://github.com/BelledonneCommunications" -ios="" -android="" -windows="" -linux="" -mac="" -web="" +windows="https://www.linphone.org/technical-corner/linphone?qt-technical_corner=2#qt-technical_corner" +linux="https://www.linphone.org/technical-corner/linphone?qt-technical_corner=2#qt-technical_corner" +mac="https://www.linphone.org/technical-corner/linphone?qt-technical_corner=2#qt-technical_corner" +fdroid="https://f-droid.org/packages/org.linphone" +googleplay="https://play.google.com/store/apps/details?id=org.linphone" +ios="https://itunes.apple.com/us/app/linphone/id360065638?mt=8" %} - - +{% include cardv2.html +title="Mumble" +image="/assets/img/tools/Mumble.png" +website="https://mumble.info/" +description="Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming. Note that while Mumble doesn't log messages or record by default, it's missing end-to-end encryption, so self-hosting is recommended." +forum="https://forum.privacytools.io/t/discussion-mumble/1289" +github="https://github.com/mumble-voip/" +windows="https://www.mumble.info/downloads" +linux="https://www.mumble.info/downloads" +mac="https://www.mumble.info/downloads" +android="https://www.mumble.info/downloads/#third-party-clients" +ios="https://apps.apple.com/us/app/mumble/id443472808?ls=1" +%}

    Worth Mentioning

    Related Information

    diff --git a/_includes/sections/vpn.html b/_includes/sections/vpn.html index 5a8ad57b..ba6d7c83 100644 --- a/_includes/sections/vpn.html +++ b/_includes/sections/vpn.html @@ -1,307 +1,90 @@ -

    Privacy VPN Services

    +

    Recommended VPN Service

    -{% assign eur_to_usd = 1.14 %} -
    -
    Email ProviderEmail Provider Website Since Jurisdiction
    - Protonmail - - WWW - Tor - 2013 Switzerland500 MBFreeAcceptedBuilt-inYes
    + Disroot WWW 2015 Netherlands2 GBFreeAcceptedBuilt-inYes
    - Tutanota - - WWW + + Netherlands + 2011 Germany 1 GB FreeNoBuilt-inYes
    - Mailfence - - WWW - 2013 Belgium500 MBFree Accepted Built-in Yes
    + + Kolab Now + + WWW + 2010 + + Switzerland + + 2 GB$ 60AcceptedNoYes
    mailbox.org 2014 Germany + + Germany + + 2 GB12 €12 € Accepted Built-in Yes
    + + Mailfence + + WWW + 2013 + + Belgium + + 500 MBFreeAcceptedBuilt-inYes
    + Neomailbox + + WWW + 2003 + + Switzerland + + 1 GB$ 49.95AcceptedBuilt-inYes
    Posteo WWW 2009 Germany + + Germany + + 2 GB12 €12 € No Built-in No
    + + Protonmail + + WWW + Tor + 2013 + + Switzerland + + 500 MBFreeAcceptedBuilt-inYes
    Runbox 1999 Norway + + Norway + + 1 GB$ 19.95$ 19.95 Accepted No Yes
    - Neomailbox - - WWW - 2003 Switzerland1 GB$ 49.95AcceptedBuilt-inYes
    + Soverin WWW 2015 Netherlands + + Netherlands + + 25 GB29 €29 €No NoNo Yes
    + StartMail WWW 2014 Netherlands + + Netherlands + + 10 GB$ 59.95$ 59.95 Accepted Built-in Yes
    - Kolab Now + + Tutanota - WWW + WWW 2010 Switzerland2 GB$ 60Accepted2011 + + Germany + + 1 GBFree NoBuilt-in Yes
    - - - - - - - - - - - - - - - - - - - - - - - +
    -
    - - - - - - - - - +
    +
    + Mullvad +
    +
    +

    Mullvad EUR €60/Year

    +

    Mullvad is a fast and inexpensive VPN with a serious focus on transparency and security, they have been in operation since 2009. It is the only VPN provider that currently meets our criteria for recommendation. Mullvad is based in Sweden and does not have a free trial. Visit mullvad.net to create an account.

    +
    409+ Servers
    +

    Mullvad has 409 servers in 38 countries at the time of writing this page. Typically the more servers a provider offers, the better: With hundreds of servers in operation, you are far more likely to find a fast connection and a server geographically closest to you.

    +
    WireGuard Support
    +

    In addition to standard OpenVPN connections, Mullvad supports Wireguard. Wireguard is an experimental protocol with theoretically better security and higher reliability, although it is not currently recommended for production use.

    +
    Independently Audited
    +

    Mullvad's VPN clients have been audited by Cure53 and Assured AB in a pentest report published at cure53.de. The security researchers concluded:

    +
    +

    ...Cure53 and Assured AB are happy with the results of the audit and the software leaves an overall positive impression. With security dedication of the in-house team at the Mullvad VPN compound, the testers have no doubts about the project being on the right track from a security standpoint.

    +
    +
    Accepts Bitcoin
    +

    Mullvad in addition to accepting credit/debit cards and PayPal, accepts Bitcoin, Bitcoin Cash, and cash/local currency as anonymous forms of payment. They also accept Swish and bank wire transfers.

    +
    No Mobile Clients
    +

    While iOS and Android clients are reportedly in the works, mobile users will need to use a traditional OpenVPN client and configuration files, which are a bit more difficult to configure.

    +
    Extra Functionality
    +

    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 xcln5hkbriyklr6n.onion.

    +
    +
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    VPN ProviderWebsiteSinceYearly PriceFree Trial# ServersWireGuardJurisdiction
    - AirVPN - WWW - 201054 €Yes162No Italy
    - AzireVPN - - WWW - 201245 €Yes22Yes Sweden
    - blackVPN - - WWW - 200949 €Yes31No Hong Kong
    - ExpressVPN - - WWW - Tor - 2009$ 99.95 Yes148No British Virgin Islands
    - FrootVPN - - WWW - 2014$ 35.88No27No Sweden
    - hide.me - - WWW - 2012FreeYes160+No Malaysia
    - IVPN - - WWW - 2009$ 100Yes38Yes Gibraltar
    - Mullvad - - WWW - Tor - 200960 €No281Yes Sweden
    - NordVPN - - WWW - 2012$ 83.88Yes5200+No Panama
    - OVPN - - WWW - 201484 €Yes67No Sweden
    - Perfect Privacy - - WWW - 2008119.99 €No54No Switzerland
    - ProtonVPN - - WWW - 2016FreeYes396No Switzerland
    - Proxy.sh - - WWW - 2012$ 40No300+No Seychelles
    - Trust.Zone - - WWW - 2014$ 39.95Yes164No Seychelles
    - VPNArea - - WWW - 2014$ 59Yes204No Bulgaria
    - VPNTunnel - - WWW - 201435.88 €No800+No Seychelles
    -
    -
    -
    -

    Our VPN Provider Criteria

    +

    Other Providers Worth Mentioning

    -
      -
    • Operating outside the USA or other Five Eyes countries.
      More: Avoid all US and UK based services.
      • -
    • OpenVPN software support.
      • -
    • Accepts Bitcoin, cash, debit cards or cash cards as a payment method.
      • -
    • No personal information is required to create an account. Only username, password and Email.
      • -
    +
    -

    We're not affiliated with any of the above-listed VPN providers. This way we can give you honest recommendations.

    - -

    More VPN Providers

    - +
    +
    + ProtonVPN
    - -
    - -

    Related VPN information

    - - - +
    +

    ProtonVPN Free USD $96/year

    +

    ProtonVPN is a strong contender in the VPN space, and they have been in operation since 2016. ProtonVPN is based in Switzerland and offers a limited free pricing tier, as well as premium options. Unfortunately due to its lack of an independent security audit it does not meet the complete criteria for recommendation, see our notes below.

    +
    Not Audited
    +

    ProtonVPN has not undergone a security audit by an independent third party, and therefore cannot be strongly recommended at this time. We have still chosen to list it on this page with the assumption that an audit will be published soon:

    +
    +

    We are currently undergoing a complete security audit of our VPN applications by a reputable Swiss security company. The results of the audit will be summarized in a public report for cases like this.

    +
    Marc Loebekken, ProtonVPN AG Legal counsel
    +
    +

    We will reevaluate this listing at the end of 2019 or when the aforementioned report has been published, whichever is sooner. +

    442+ Servers
    +

    ProtonVPN has 442 servers in 33 countries at the time of writing this page. Typically the more servers a provider offers, the better: With hundreds of servers in operation, you are far more likely to find a fast connection and a server geographically closest to you.

    +
    Accepts Bitcoin
    +

    ProtonVPN does technically accept Bitcoin payments, however you either need to have an existing account, or contact their support team in advance to register with Bitcoin.

    +
    Mobile Clients
    +

    In addition to providing standard OpenVPN configuration files, ProtonVPN has mobile clients for iOS or Android allowing for easy connections to their servers.

    +
    Extra Functionality
    +

    The ProtonVPN clients have a built-in killswitch to block internet connections outside of the VPN. They also are able to automatically start on boot. ProtonVPN also offers "Tor" servers allowing you to easily connect to onion sites, but we still strongly recommend using the official Tor Browser for this purpose.

    + +
    +
    + IVPN +
    +
    +

    IVPN USD $100/Year

    +

    IVPN is another strong premium VPN provider, and they have been in operation since 2009. IVPN is based in Gibraltar and offers a 3 day free trial. Unfortunately due to its lack of an independent security audit it does not meet the complete criteria for recommendation, see our notes below.

    +
    No Security Audit
    +

    IVPN has undergone a no-logging audit from Cure53 which concluded in agreement with IVPN's no-logging claim. However, IVPN has not undergone a more comprehensive security audit by an independent third party, and therefore cannot be strongly recommended at this time. We have still chosen to list it on this page with the assumption that an audit will be published soon: The IVPN team reportedly plans to begin the process in September.

    +

    We will reevaluate this listing at the end of 2019 or when the aforementioned report has been published, whichever is sooner. +

    70+ Servers
    +

    IVPN has 70 servers in 29 countries at the time of writing this page. Typically the more servers a provider offers, the better. IVPN has a decent (but not exceptional) server count that will most likely provide adequate coverage to most users.

    +
    Accepts Bitcoin
    +

    In addition to accepting credit/debit cards and PayPal, IVPN accepts Bitcoin and cash/local currency (on annual plans) as anonymous forms of payment.

    +
    Mobile Clients
    +

    In addition to providing standard OpenVPN configuration files, IVPN has mobile clients for iOS or Android allowing for easy connections to their servers.

    +
    Extra Functionality
    +

    The IVPN clients have a built-in killswitch to block internet connections outside of the VPN. They also are able to automatically start on boot. IVPN also provides "AntiTracker" functionality, which blocks advertising networks and trackers from the network level.

    +
    +
    +
    diff --git a/_includes/sections/windows10.html b/_includes/sections/windows10.html index c8a1977a..195fdd7c 100644 --- a/_includes/sections/windows10.html +++ b/_includes/sections/windows10.html @@ -4,7 +4,7 @@ Microsoft introduced a lot of new features in Windows 10 such as Cortana. However, most of them are violating your privacy.
    -Windows 10 Privacy +Windows 10 Privacy
    1. Data syncing is by default enabled. diff --git a/_layouts/minimal.html b/_layouts/minimal.html index 1061dc36..470aa55f 100644 --- a/_layouts/minimal.html +++ b/_layouts/minimal.html @@ -2,6 +2,7 @@ {% include head.html %} +
      {% include nav.html %}
      diff --git a/_sass/ptio-font.scss b/_sass/ptio-font.scss new file mode 100644 index 00000000..4ab4452e --- /dev/null +++ b/_sass/ptio-font.scss @@ -0,0 +1,54 @@ +/* + Icon Font: ptio-font +*/ + +@font-face { + font-family: "ptio-font"; + src: url("../webfonts/ptio-font.eot"); + src: url("../webfonts/ptio-font.eot?#iefix") format("embedded-opentype"), + url("../webfonts/ptio-font.woff2") format("woff2"), + url("../webfonts/ptio-font.woff") format("woff"), + url("../webfonts/ptio-font.ttf") format("truetype"), + url("../webfonts/ptio-font.svg#ptio-font") format("svg"); + font-weight: normal; + font-style: normal; +} + +@media screen and (-webkit-min-device-pixel-ratio:0) { + @font-face { + font-family: "ptio-font"; + src: url("../webfonts/ptio-font.svg#ptio-font") format("svg"); + } +} + +[data-icon]:before { content: attr(data-icon); } + +[data-icon]:before, +.ptio-f-droid:before, +.ptio-ios:before, +.ptio-linux:before, +.ptio-macos:before, +.ptio-netbsd:before, +.ptio-openbsd:before, +.ptio-sailfish-os:before { + display: inline-block; + font-family: "ptio-font"; + font-style: normal; + font-weight: normal; + font-variant: normal; + line-height: 1; + text-decoration: inherit; + text-rendering: optimizeLegibility; + text-transform: none; + -moz-osx-font-smoothing: grayscale; + -webkit-font-smoothing: antialiased; + font-smoothing: antialiased; +} + +.ptio-f-droid:before { content: "\f100"; } +.ptio-ios:before { content: "\f101"; } +.ptio-linux:before { content: "\f107"; } +.ptio-macos:before { content: "\f102"; } +.ptio-netbsd:before { content: "\f103"; } +.ptio-openbsd:before { content: "\f104"; } +.ptio-sailfish-os:before { content: "\f106"; } diff --git a/about/javascript/index.html b/about/javascript/index.html new file mode 100644 index 00000000..1b77e49a --- /dev/null +++ b/about/javascript/index.html @@ -0,0 +1,27 @@ +

      JavaScript Licenses

      + + + + + + + + + + + + + + + + + + + + + + + + + +
      main.jsCC0-1.0-only
      redirects.jsCC0-1.0-only
      bootstrap.min.jsExpat
      jquery-3.3.1.min.jsExpat
      popper.min.jsExpat
      sortable.min.jsExpat
      diff --git a/assets/css/dark.scss b/assets/css/dark.scss new file mode 100644 index 00000000..d982475b --- /dev/null +++ b/assets/css/dark.scss @@ -0,0 +1,179 @@ +--- +--- +$dark-400: #181b21; +$dark-300: #22262e; +$dark-200: #343a46; +$dark-100: #464f60; +$light: #d8d8d8; +$primary: #345e8e; +$danger: #b63f4a; +$secondary: $dark-100; +$success: #2c7f40; +$warning: #c6a339; +$info: #218899; + + +/* + * HTML + */ + +body { + background: $dark-400; + color: $light; +} +a { + color: lighten($primary, 25%); +} +a:hover { + color: lighten($primary, 10%); +} +img { + filter: saturate(80%); +} + + +/* + * Bootstrap + */ + +.alert a { + color: #214D97; +} + +.bg-secondary, .btn-secondary, .badge-secondary { background-color: $secondary !important; } +.btn-secondary, .card-secondary .card-header { border-color: $secondary !important; } +.text-secondary { color: $secondary !important; } +.alert-secondary, .btn-secondary:hover { + color: $light; + background-color: darken($secondary, 10%); + border-color: darken($secondary, 10%); +} + +.bg-primary, .btn-primary, .badge-primary { background-color: $primary !important; } +.btn-primary, .card-primary .card-header { border-color: $primary !important; } +.text-primary { color: $primary !important; } +.alert-primary, .btn-primary:hover { + color: $light; + background-color: darken($primary, 10%); + border-color: darken($primary, 10%); +} + +.bg-warning, .btn-warning, .badge-warning { background-color: $warning !important; } +.btn-warning, .card-warning .card-header { border-color: $warning !important; } +.text-warning { color: $warning !important; } +.card-warning > .text-dark { color: $dark-400 !important; } +.alert-warning, .btn-warning:hover { + color: $light; + background-color: darken($warning, 10%); + border-color: darken($warning, 10%); +} + +.bg-info, .btn-info, .badge-info { background-color: $info !important; } +.btn-info, .card-info .card-header { border-color: $info !important; } +.text-info { color: $info !important; } +.alert-info, .btn-info:hover { + color: $light; + background-color: darken($info, 10%); + border-color: darken($info, 10%); +} + +.bg-success, .btn-success, .badge-success { background-color: $success !important; } +.btn-success, .card-success .card-header { border-color: $success !important; } +.text-success { color: $success !important; } +.alert-success, .btn-success { + color: $light; + background-color: darken($success, 10%); + border-color: darken($success, 10%); +} + +.bg-danger, .btn-danger, .badge-danger { background-color: $danger !important; } +.btn-danger, .card-danger .card-header { border-color: $danger !important; } +.text-danger { color: $danger !important; } +.alert-danger, .btn-danger:hover { + color: $light; + background-color: darken($danger, 10%); + border-color: darken($danger, 10%); +} + +.card { + box-shadow: none !important; +} + +.dropdown-item:hover { + color: $light; + background-color: $dark-300; +} + +.form-control, +.form-control:focus { + color: $light; + background: $dark-300; + border-color: $dark-300; +} + +.form-control[readonly], +.form-control:disabled { + background: $dark-300; +} + +.card, +.jumbotron, +.list-group-item { + background: $dark-300; +} + +.blockquote { + border-color: $dark-300; +} + +.bg-dark { + background-color: $dark-300 !important; +} + +.dropdown-item { + color: $light; +} + +.list-group-item { + border-color: $dark-200; +} + +.text-dark { + color: $light !important; +} + +table[data-sortable].sortable-theme-bootstrap { + color: $light; + background-color: $dark-300; +} +table[data-sortable].sortable-theme-bootstrap th, +table[data-sortable].sortable-theme-bootstrap td { + border-color: $dark-100 !important; +} +table[data-sortable].sortable-theme-bootstrap th[data-sorted="true"] { + color: $light; + background: $dark-200; +} +table[data-sortable].sortable-theme-bootstrap th[data-sorted="true"][data-sorted-direction="ascending"]::after, { + border-bottom-color: $light; +} +table[data-sortable].sortable-theme-bootstrap th[data-sorted="true"][data-sorted-direction="descending"]::after { + border-top-color: $light; +} + + +/* + * Other + */ + +.nav-dropdown { + color: $light; + background-color: $dark-400; + border-color: $dark-300; +} + +.nav-theme-icon:before { + color: $warning; + font-size: 1em; + content: "\f185"; +} diff --git a/assets/css/style.scss b/assets/css/style.scss index 7ccd8321..601fb38b 100644 --- a/assets/css/style.scss +++ b/assets/css/style.scss @@ -5,6 +5,7 @@ @import 'bootstrap'; @import 'flag-icon'; @import 'fontawesome'; +@import 'ptio-font'; @import 'sortable-theme-bootstrap'; body { @@ -177,9 +178,188 @@ h2, h3:not(.h5), h4, h5 { text-align: justify; } +.no-text-wrap { + white-space: nowrap; +} + footer { img, i { margin-right: 1rem; } -} \ No newline at end of file +} + +.hover-text-decoration-none:hover { + text-decoration: none; + -webkit-text-decoration-skip: object; +} + +.table td, .table th { + vertical-align: middle; +} + + +/* + * Navbar + */ + +#navbar { + margin-left: auto; + margin-right: auto; + max-width: 1140px; + padding: .75rem 3rem; + color: rgba(255,255,255,0.5); + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} + +#navbar .menu { + position: relative; +} + +.menu { + display: flex; + justify-content: space-between; +} + +.nav-anchor { + display: inline; + color: inherit; +} + +.nav-anchor:hover { + text-decoration: none; +} + +.nav-anchor:hover, +.nav-summary:hover, +.nav-details[open] > summary > .nav-summary { + color: rgba(255,255,255,0.8); +} + +.nav-dropdown { + color: var(--dark); + background-color: var(--light); + padding: .5rem 0; + margin-top: .5rem; + position: absolute; + border: 1px solid #dee2e6; + border-radius: .25rem; + box-shadow: 0 .5rem 1rem rgba(0,0,0,.15); + z-index: 10; +} + +#nav-right > details > .nav-dropdown { + right: 0; +} + +.nav-details { + display: inline; + position: relative; +} + +.nav-details > summary { + list-style: none; +} +.nav-details > summary::-webkit-details-marker { + display: none; +} + +#nav-right > .nav-details, +#nav-right > .nav-anchor { + padding-left: 0.5rem; +} +#nav-left > .nav-details, +#nav-left > .nav-anchor { + padding-right: 0.5rem; +} + +input#nav-toggle, +#nav-toggle-label { + display: none; +} + +#nav-home-mobile { + display: none; +} + +#nav-switch-theme { + /* We will make it visible with JavaScript + * as it does not work without it */ + display: none; +} + +/* + * Mobile hamburger menu + */ + +@media only screen and (max-width: 992px) { + .menu, + .nav-details, + .nav-anchor { + display: block; + } + .menu { + margin-top: 0.5rem; + } + #nav-home { + display: none; + } + #nav-home-mobile { + display: inline; + } + input#nav-toggle:checked ~ .menu { + display: none; + } + input#nav-toggle + label { + display: block; + cursor: pointer; + margin-top: 0.25rem; + float: right; + } + .nav-dropdown { + display: block; + position: relative; + max-height: 15.75em; + overflow-y: auto; + left: 0; + right: 0; + } + #nav-right > .nav-details, + #nav-right > .nav-anchor, + #nav-left > .nav-details, + #nav-left > .nav-anchor { + padding: 0 0; + } + #navbar { + padding: 1rem 3rem; + } +} + +@media only screen and (max-width: 768px) { + #navbar { + padding: 1rem 2rem; + } +} + +@media only screen and (max-width: 575px) { + #navbar { + padding: 1rem 1rem; + } +} + +@media only screen and (max-height: 350px) { + .nav-dropdown { + max-height: 8em; + } +} + +.nav-theme-icon:before { + color: var(--warning); + font-size: 0.875em; + content: "\f186"; +} diff --git a/assets/img/addons/Blokada.png b/assets/img/addons/Blokada.png index 08135c64..42646666 100644 Binary files a/assets/img/addons/Blokada.png and b/assets/img/addons/Blokada.png differ diff --git a/assets/img/addons/Disconnect.png b/assets/img/addons/Disconnect.png deleted file mode 100644 index d625ff85..00000000 Binary files a/assets/img/addons/Disconnect.png and /dev/null differ diff --git a/assets/img/addons/Orbot.png b/assets/img/addons/Orbot.png index a09eed53..d694dbb7 100644 Binary files a/assets/img/addons/Orbot.png and b/assets/img/addons/Orbot.png differ diff --git a/assets/img/addons/Self-Destructing-Cookies.png b/assets/img/addons/Self-Destructing-Cookies.png deleted file mode 100644 index 029fc954..00000000 Binary files a/assets/img/addons/Self-Destructing-Cookies.png and /dev/null differ diff --git a/assets/img/addons/cookie-autodelete.png b/assets/img/addons/cookie-autodelete.png index cede2b55..41578639 100644 Binary files a/assets/img/addons/cookie-autodelete.png and b/assets/img/addons/cookie-autodelete.png differ diff --git a/assets/img/addons/decentraleyes.png b/assets/img/addons/decentraleyes.png index c3225d11..c9262b5c 100644 Binary files a/assets/img/addons/decentraleyes.png and b/assets/img/addons/decentraleyes.png differ diff --git a/assets/img/addons/https-everywhere.png b/assets/img/addons/https-everywhere.png index 3f094553..c37257de 100644 Binary files a/assets/img/addons/https-everywhere.png and b/assets/img/addons/https-everywhere.png differ diff --git a/assets/img/addons/netguard.png b/assets/img/addons/netguard.png index f1ff8b42..f1c9f7ed 100644 Binary files a/assets/img/addons/netguard.png and b/assets/img/addons/netguard.png differ diff --git a/assets/img/addons/noscript.png b/assets/img/addons/noscript.png index 8a49824a..01492186 100644 Binary files a/assets/img/addons/noscript.png and b/assets/img/addons/noscript.png differ diff --git a/assets/img/addons/privacy-badger.png b/assets/img/addons/privacy-badger.png index ed96527a..c943c412 100644 Binary files a/assets/img/addons/privacy-badger.png and b/assets/img/addons/privacy-badger.png differ diff --git a/assets/img/addons/snowflake.png b/assets/img/addons/snowflake.png index 0ac5cffb..74e9ff28 100644 Binary files a/assets/img/addons/snowflake.png and b/assets/img/addons/snowflake.png differ diff --git a/assets/img/addons/tosdr.png b/assets/img/addons/tosdr.png index 510fe5c5..07e3b406 100644 Binary files a/assets/img/addons/tosdr.png and b/assets/img/addons/tosdr.png differ diff --git a/assets/img/addons/ublock-origin.png b/assets/img/addons/ublock-origin.png index 44112021..895906d4 100644 Binary files a/assets/img/addons/ublock-origin.png and b/assets/img/addons/ublock-origin.png differ diff --git a/assets/img/addons/ublock.png b/assets/img/addons/ublock.png deleted file mode 100644 index 44112021..00000000 Binary files a/assets/img/addons/ublock.png and /dev/null differ diff --git a/assets/img/addons/umatrix.png b/assets/img/addons/umatrix.png index 936f16c1..8375c8e9 100644 Binary files a/assets/img/addons/umatrix.png and b/assets/img/addons/umatrix.png differ diff --git a/assets/img/addons/xprivacylua.png b/assets/img/addons/xprivacylua.png deleted file mode 100644 index b611e5fe..00000000 Binary files a/assets/img/addons/xprivacylua.png and /dev/null differ diff --git a/assets/img/favicons/android-chrome-144x144.png b/assets/img/favicons/android-chrome-144x144.png index fa1794da..89ee8da7 100644 Binary files a/assets/img/favicons/android-chrome-144x144.png and b/assets/img/favicons/android-chrome-144x144.png differ diff --git a/assets/img/favicons/android-chrome-36x36.png b/assets/img/favicons/android-chrome-36x36.png index d568997d..0258a373 100644 Binary files a/assets/img/favicons/android-chrome-36x36.png and b/assets/img/favicons/android-chrome-36x36.png differ diff --git a/assets/img/favicons/android-chrome-48x48.png b/assets/img/favicons/android-chrome-48x48.png index 9aba5e5c..9472839e 100644 Binary files a/assets/img/favicons/android-chrome-48x48.png and b/assets/img/favicons/android-chrome-48x48.png differ diff --git a/assets/img/favicons/android-chrome-72x72.png b/assets/img/favicons/android-chrome-72x72.png index 445dd4b3..b9aba7c1 100644 Binary files a/assets/img/favicons/android-chrome-72x72.png and b/assets/img/favicons/android-chrome-72x72.png differ diff --git a/assets/img/favicons/android-chrome-96x96.png b/assets/img/favicons/android-chrome-96x96.png index 97b2104c..30ec0aa2 100644 Binary files a/assets/img/favicons/android-chrome-96x96.png and b/assets/img/favicons/android-chrome-96x96.png differ diff --git a/assets/img/favicons/apple-touch-icon-120x120.png b/assets/img/favicons/apple-touch-icon-120x120.png index 11d105ac..25d91626 100644 Binary files a/assets/img/favicons/apple-touch-icon-120x120.png and b/assets/img/favicons/apple-touch-icon-120x120.png differ diff --git a/assets/img/favicons/apple-touch-icon-144x144.png b/assets/img/favicons/apple-touch-icon-144x144.png index 5870270a..3a2b4f53 100644 Binary files a/assets/img/favicons/apple-touch-icon-144x144.png and b/assets/img/favicons/apple-touch-icon-144x144.png differ diff --git a/assets/img/favicons/apple-touch-icon-57x57.png b/assets/img/favicons/apple-touch-icon-57x57.png index cde87edc..b5d02c09 100644 Binary files a/assets/img/favicons/apple-touch-icon-57x57.png and b/assets/img/favicons/apple-touch-icon-57x57.png differ diff --git a/assets/img/favicons/apple-touch-icon-60x60.png b/assets/img/favicons/apple-touch-icon-60x60.png index b187b4cd..effda685 100644 Binary files a/assets/img/favicons/apple-touch-icon-60x60.png and b/assets/img/favicons/apple-touch-icon-60x60.png differ diff --git a/assets/img/favicons/favicon-32x32.png b/assets/img/favicons/favicon-32x32.png index 358e2a07..ac47b360 100644 Binary files a/assets/img/favicons/favicon-32x32.png and b/assets/img/favicons/favicon-32x32.png differ diff --git a/assets/img/favicons/favicon-96x96.png b/assets/img/favicons/favicon-96x96.png index 97b2104c..30ec0aa2 100644 Binary files a/assets/img/favicons/favicon-96x96.png and b/assets/img/favicons/favicon-96x96.png differ diff --git a/assets/img/favicons/mstile-144x144.png b/assets/img/favicons/mstile-144x144.png index fa1794da..89ee8da7 100644 Binary files a/assets/img/favicons/mstile-144x144.png and b/assets/img/favicons/mstile-144x144.png differ diff --git a/assets/img/favicons/mstile-70x70.png b/assets/img/favicons/mstile-70x70.png index 862e0b22..36a2caa9 100644 Binary files a/assets/img/favicons/mstile-70x70.png and b/assets/img/favicons/mstile-70x70.png differ diff --git a/assets/img/icons/bromite.png b/assets/img/icons/bromite.png new file mode 100644 index 00000000..73d7f940 Binary files /dev/null and b/assets/img/icons/bromite.png differ diff --git a/assets/img/icons/discourse.png b/assets/img/icons/discourse.png index 787af174..2b17c4ab 100644 Binary files a/assets/img/icons/discourse.png and b/assets/img/icons/discourse.png differ diff --git a/assets/img/icons/duckduckgo.png b/assets/img/icons/duckduckgo.png new file mode 100644 index 00000000..c9d83dcb Binary files /dev/null and b/assets/img/icons/duckduckgo.png differ diff --git a/assets/img/icons/github.png b/assets/img/icons/github.png index d3dd81b6..cb6fa293 100644 Binary files a/assets/img/icons/github.png and b/assets/img/icons/github.png differ diff --git a/assets/img/icons/mastodon.png b/assets/img/icons/mastodon.png index c2731269..099dfd98 100644 Binary files a/assets/img/icons/mastodon.png and b/assets/img/icons/mastodon.png differ diff --git a/assets/img/icons/onionbrowser.png b/assets/img/icons/onionbrowser.png new file mode 100644 index 00000000..22a3a96d Binary files /dev/null and b/assets/img/icons/onionbrowser.png differ diff --git a/assets/img/icons/reddit.png b/assets/img/icons/reddit.png deleted file mode 100644 index 2ed72b80..00000000 Binary files a/assets/img/icons/reddit.png and /dev/null differ diff --git a/assets/img/icons/twitter.png b/assets/img/icons/twitter.png deleted file mode 100644 index 86692417..00000000 Binary files a/assets/img/icons/twitter.png and /dev/null differ diff --git a/assets/img/layout/Bitcoin.png b/assets/img/layout/Bitcoin.png index d7bc1411..4b219af3 100644 Binary files a/assets/img/layout/Bitcoin.png and b/assets/img/layout/Bitcoin.png differ diff --git a/assets/img/layout/Glenn-Greenwald-Why-privacy-matters.jpg b/assets/img/layout/Glenn-Greenwald-Why-privacy-matters.jpg index 9862c2f3..1eb6a303 100644 Binary files a/assets/img/layout/Glenn-Greenwald-Why-privacy-matters.jpg and b/assets/img/layout/Glenn-Greenwald-Why-privacy-matters.jpg differ diff --git a/assets/img/layout/PayPal.png b/assets/img/layout/PayPal.png index fa1b4370..c2a0e7c4 100644 Binary files a/assets/img/layout/PayPal.png and b/assets/img/layout/PayPal.png differ diff --git a/assets/img/layout/UKUSA.png b/assets/img/layout/UKUSA.png index fc611042..8d50f442 100644 Binary files a/assets/img/layout/UKUSA.png and b/assets/img/layout/UKUSA.png differ diff --git a/assets/img/layout/USA.png b/assets/img/layout/USA.png index 34b6ef9b..3ed0c235 100644 Binary files a/assets/img/layout/USA.png and b/assets/img/layout/USA.png differ diff --git a/assets/img/layout/Windows-10-Privacy.jpg b/assets/img/layout/Windows-10-Privacy.jpg deleted file mode 100644 index 72f7697a..00000000 Binary files a/assets/img/layout/Windows-10-Privacy.jpg and /dev/null differ diff --git a/assets/img/layout/Windows-10-Privacy.png b/assets/img/layout/Windows-10-Privacy.png new file mode 100644 index 00000000..410d083d Binary files /dev/null and b/assets/img/layout/Windows-10-Privacy.png differ diff --git a/assets/img/layout/browser-fingerprint.jpg b/assets/img/layout/browser-fingerprint.jpg deleted file mode 100644 index 94486773..00000000 Binary files a/assets/img/layout/browser-fingerprint.jpg and /dev/null differ diff --git a/assets/img/layout/browser-fingerprint.png b/assets/img/layout/browser-fingerprint.png new file mode 100644 index 00000000..13af13c0 Binary files /dev/null and b/assets/img/layout/browser-fingerprint.png differ diff --git a/assets/img/layout/creativecommons.png b/assets/img/layout/creativecommons.png index 1aa7b7f7..e485f3ef 100644 Binary files a/assets/img/layout/creativecommons.png and b/assets/img/layout/creativecommons.png differ diff --git a/assets/img/layout/git.png b/assets/img/layout/git.png index a34279d8..34463594 100644 Binary files a/assets/img/layout/git.png and b/assets/img/layout/git.png differ diff --git a/assets/img/layout/jonah.png b/assets/img/layout/jonah.png deleted file mode 100644 index d3daf6f5..00000000 Binary files a/assets/img/layout/jonah.png and /dev/null differ diff --git a/assets/img/layout/kopimi.png b/assets/img/layout/kopimi.png index 8416416f..eed7d78d 100644 Binary files a/assets/img/layout/kopimi.png and b/assets/img/layout/kopimi.png differ diff --git a/assets/img/layout/logo.png b/assets/img/layout/logo.png index 00d2874b..4a5c00c2 100644 Binary files a/assets/img/layout/logo.png and b/assets/img/layout/logo.png differ diff --git a/assets/img/layout/logo_smaller.png b/assets/img/layout/logo_smaller.png index eae05e59..9a0472df 100644 Binary files a/assets/img/layout/logo_smaller.png and b/assets/img/layout/logo_smaller.png differ diff --git a/assets/img/layout/ogimage.jpg b/assets/img/layout/ogimage.jpg index 9eee4c52..363cebac 100644 Binary files a/assets/img/layout/ogimage.jpg and b/assets/img/layout/ogimage.jpg differ diff --git a/assets/img/layout/privatesearch.png b/assets/img/layout/privatesearch.png index 27348781..87aa9316 100644 Binary files a/assets/img/layout/privatesearch.png and b/assets/img/layout/privatesearch.png differ diff --git a/assets/img/layout/qr.png b/assets/img/layout/qr.png index 07728c6c..f664dd02 100644 Binary files a/assets/img/layout/qr.png and b/assets/img/layout/qr.png differ diff --git a/assets/img/layout/reddit-logo.png b/assets/img/layout/reddit-logo.png index d4f9760e..46b9fea1 100644 Binary files a/assets/img/layout/reddit-logo.png and b/assets/img/layout/reddit-logo.png differ diff --git a/assets/img/layout/tor.png b/assets/img/layout/tor.png index 2372d1f6..95a698a3 100644 Binary files a/assets/img/layout/tor.png and b/assets/img/layout/tor.png differ diff --git a/assets/img/layout/warrant-canary.jpg b/assets/img/layout/warrant-canary.jpg index 3e437e5e..91a77750 100644 Binary files a/assets/img/layout/warrant-canary.jpg and b/assets/img/layout/warrant-canary.jpg differ diff --git a/assets/img/layout/www.png b/assets/img/layout/www.png index dcd65111..ba318b3a 100644 Binary files a/assets/img/layout/www.png and b/assets/img/layout/www.png differ diff --git a/assets/img/layout/zero.png b/assets/img/layout/zero.png index a63a692b..d9679ef1 100644 Binary files a/assets/img/layout/zero.png and b/assets/img/layout/zero.png differ diff --git a/assets/img/misc/email.png b/assets/img/misc/email.png index c98eaf7d..54963ab6 100644 Binary files a/assets/img/misc/email.png and b/assets/img/misc/email.png differ diff --git a/assets/img/misc/smile.png b/assets/img/misc/smile.png index b59dd2cb..704803db 100644 Binary files a/assets/img/misc/smile.png and b/assets/img/misc/smile.png differ diff --git a/assets/img/provider/AirVPN.png b/assets/img/provider/AirVPN.png deleted file mode 100644 index d2d3b6a6..00000000 Binary files a/assets/img/provider/AirVPN.png and /dev/null differ diff --git a/assets/img/provider/AzireVPN.png b/assets/img/provider/AzireVPN.png deleted file mode 100644 index c63aefd7..00000000 Binary files a/assets/img/provider/AzireVPN.png and /dev/null differ diff --git a/assets/img/provider/CryptPad.png b/assets/img/provider/CryptPad.png index fec8e8de..faf8a942 100644 Binary files a/assets/img/provider/CryptPad.png and b/assets/img/provider/CryptPad.png differ diff --git a/assets/img/provider/DuckDuckGo.jpg b/assets/img/provider/DuckDuckGo.jpg deleted file mode 100644 index 7ed97d35..00000000 Binary files a/assets/img/provider/DuckDuckGo.jpg and /dev/null differ diff --git a/assets/img/provider/DuckDuckGo.png b/assets/img/provider/DuckDuckGo.png new file mode 100644 index 00000000..9e396811 Binary files /dev/null and b/assets/img/provider/DuckDuckGo.png differ diff --git a/assets/img/provider/EarthVPN.png b/assets/img/provider/EarthVPN.png deleted file mode 100644 index e74c040b..00000000 Binary files a/assets/img/provider/EarthVPN.png and /dev/null differ diff --git a/assets/img/provider/ExpressVPN.png b/assets/img/provider/ExpressVPN.png deleted file mode 100644 index 11254fc2..00000000 Binary files a/assets/img/provider/ExpressVPN.png and /dev/null differ diff --git a/assets/img/provider/FrootVPN.png b/assets/img/provider/FrootVPN.png deleted file mode 100644 index f9e34812..00000000 Binary files a/assets/img/provider/FrootVPN.png and /dev/null differ diff --git a/assets/img/provider/IPredator.png b/assets/img/provider/IPredator.png index 1c19dfa9..b57a40f6 100644 Binary files a/assets/img/provider/IPredator.png and b/assets/img/provider/IPredator.png differ diff --git a/assets/img/provider/IVPN.png b/assets/img/provider/IVPN.png index 07ead1e8..67d356a1 100644 Binary files a/assets/img/provider/IVPN.png and b/assets/img/provider/IVPN.png differ diff --git a/assets/img/provider/Kolab-Now.png b/assets/img/provider/Kolab-Now.png index 86ea17bc..26fe5e87 100644 Binary files a/assets/img/provider/Kolab-Now.png and b/assets/img/provider/Kolab-Now.png differ diff --git a/assets/img/provider/Mail-in-a-Box.png b/assets/img/provider/Mail-in-a-Box.png index 8b455ada..bb8fd917 100644 Binary files a/assets/img/provider/Mail-in-a-Box.png and b/assets/img/provider/Mail-in-a-Box.png differ diff --git a/assets/img/provider/Mailfence.png b/assets/img/provider/Mailfence.png index 8b4163af..ebbd1879 100644 Binary files a/assets/img/provider/Mailfence.png and b/assets/img/provider/Mailfence.png differ diff --git a/assets/img/provider/Mullvad.png b/assets/img/provider/Mullvad.png index 6bbb1536..211158f0 100644 Binary files a/assets/img/provider/Mullvad.png and b/assets/img/provider/Mullvad.png differ diff --git a/assets/img/provider/Neomailbox.png b/assets/img/provider/Neomailbox.png index 6f97caf3..662c36b0 100644 Binary files a/assets/img/provider/Neomailbox.png and b/assets/img/provider/Neomailbox.png differ diff --git a/assets/img/provider/Nextcloud.png b/assets/img/provider/Nextcloud.png index f98a26de..8e07c3e2 100644 Binary files a/assets/img/provider/Nextcloud.png and b/assets/img/provider/Nextcloud.png differ diff --git a/assets/img/provider/Njalla.png b/assets/img/provider/Njalla.png index bfd35fff..a04454cd 100644 Binary files a/assets/img/provider/Njalla.png and b/assets/img/provider/Njalla.png differ diff --git a/assets/img/provider/NordVPN.png b/assets/img/provider/NordVPN.png deleted file mode 100644 index 7a3f6a2b..00000000 Binary files a/assets/img/provider/NordVPN.png and /dev/null differ diff --git a/assets/img/provider/Perfect-Privacy.png b/assets/img/provider/Perfect-Privacy.png deleted file mode 100644 index 784bcf40..00000000 Binary files a/assets/img/provider/Perfect-Privacy.png and /dev/null differ diff --git a/assets/img/provider/Posteo.png b/assets/img/provider/Posteo.png index 0abda0bb..83757b96 100644 Binary files a/assets/img/provider/Posteo.png and b/assets/img/provider/Posteo.png differ diff --git a/assets/img/provider/ProtonMail.ch.png b/assets/img/provider/ProtonMail.ch.png index 924418b7..c36b3363 100644 Binary files a/assets/img/provider/ProtonMail.ch.png and b/assets/img/provider/ProtonMail.ch.png differ diff --git a/assets/img/provider/ProtonVPN.png b/assets/img/provider/ProtonVPN.png index 677b4027..2a65104c 100644 Binary files a/assets/img/provider/ProtonVPN.png and b/assets/img/provider/ProtonVPN.png differ diff --git a/assets/img/provider/Proxy.sh.png b/assets/img/provider/Proxy.sh.png deleted file mode 100644 index 37ee777c..00000000 Binary files a/assets/img/provider/Proxy.sh.png and /dev/null differ diff --git a/assets/img/provider/Qwant.png b/assets/img/provider/Qwant.png new file mode 100644 index 00000000..c7253510 Binary files /dev/null and b/assets/img/provider/Qwant.png differ diff --git a/assets/img/provider/RuggedInbox.png b/assets/img/provider/RuggedInbox.png deleted file mode 100644 index 20194e42..00000000 Binary files a/assets/img/provider/RuggedInbox.png and /dev/null differ diff --git a/assets/img/provider/S4.jpg b/assets/img/provider/S4.jpg deleted file mode 100644 index 7b1003d6..00000000 Binary files a/assets/img/provider/S4.jpg and /dev/null differ diff --git a/assets/img/provider/S4.png b/assets/img/provider/S4.png new file mode 100644 index 00000000..394d9913 Binary files /dev/null and b/assets/img/provider/S4.png differ diff --git a/assets/img/provider/Soverin.png b/assets/img/provider/Soverin.png index 675eb56b..8c54f8dc 100644 Binary files a/assets/img/provider/Soverin.png and b/assets/img/provider/Soverin.png differ diff --git a/assets/img/provider/StartMail.png b/assets/img/provider/StartMail.png index d16ac043..cf03655d 100644 Binary files a/assets/img/provider/StartMail.png and b/assets/img/provider/StartMail.png differ diff --git a/assets/img/provider/StartPage.png b/assets/img/provider/StartPage.png index 08c33d79..f0a7f7bb 100644 Binary files a/assets/img/provider/StartPage.png and b/assets/img/provider/StartPage.png differ diff --git a/assets/img/provider/Trust.Zone.png b/assets/img/provider/Trust.Zone.png deleted file mode 100644 index 10ab9bf6..00000000 Binary files a/assets/img/provider/Trust.Zone.png and /dev/null differ diff --git a/assets/img/provider/Tutanota.png b/assets/img/provider/Tutanota.png index fa8feccc..e019d0ae 100644 Binary files a/assets/img/provider/Tutanota.png and b/assets/img/provider/Tutanota.png differ diff --git a/assets/img/provider/VPN.ht.png b/assets/img/provider/VPN.ht.png deleted file mode 100644 index 12885d5c..00000000 Binary files a/assets/img/provider/VPN.ht.png and /dev/null differ diff --git a/assets/img/provider/VPNTunnel.png b/assets/img/provider/VPNTunnel.png deleted file mode 100644 index 69985710..00000000 Binary files a/assets/img/provider/VPNTunnel.png and /dev/null differ diff --git a/assets/img/provider/bahnhof.png b/assets/img/provider/bahnhof.png index bb160314..65693ce9 100644 Binary files a/assets/img/provider/bahnhof.png and b/assets/img/provider/bahnhof.png differ diff --git a/assets/img/provider/blackVPN.png b/assets/img/provider/blackVPN.png deleted file mode 100644 index e902b78c..00000000 Binary files a/assets/img/provider/blackVPN.png and /dev/null differ diff --git a/assets/img/provider/datacell.png b/assets/img/provider/datacell.png index 554d6818..b595eeb5 100644 Binary files a/assets/img/provider/datacell.png and b/assets/img/provider/datacell.png differ diff --git a/assets/img/provider/disroot.org.png b/assets/img/provider/disroot.org.png index 31099d7e..b12a66e6 100644 Binary files a/assets/img/provider/disroot.org.png and b/assets/img/provider/disroot.org.png differ diff --git a/assets/img/provider/etesync.png b/assets/img/provider/etesync.png index 4bf192a3..ba771054 100644 Binary files a/assets/img/provider/etesync.png and b/assets/img/provider/etesync.png differ diff --git a/assets/img/provider/gnu-social.png b/assets/img/provider/gnu-social.png index 8f5f3712..6338e3b0 100644 Binary files a/assets/img/provider/gnu-social.png and b/assets/img/provider/gnu-social.png differ diff --git a/assets/img/provider/hide.me.png b/assets/img/provider/hide.me.png deleted file mode 100644 index 1c95f481..00000000 Binary files a/assets/img/provider/hide.me.png and /dev/null differ diff --git a/assets/img/provider/mailbox.org.png b/assets/img/provider/mailbox.org.png index dd37749b..b3197636 100644 Binary files a/assets/img/provider/mailbox.org.png and b/assets/img/provider/mailbox.org.png differ diff --git a/assets/img/provider/orange_hosting.png b/assets/img/provider/orange_hosting.png index fc2a984a..beb6fba5 100644 Binary files a/assets/img/provider/orange_hosting.png and b/assets/img/provider/orange_hosting.png differ diff --git a/assets/img/provider/ovpn.png b/assets/img/provider/ovpn.png deleted file mode 100644 index 9145982d..00000000 Binary files a/assets/img/provider/ovpn.png and /dev/null differ diff --git a/assets/img/provider/pixelfed.png b/assets/img/provider/pixelfed.png index 774257af..070c6729 100644 Binary files a/assets/img/provider/pixelfed.png and b/assets/img/provider/pixelfed.png differ diff --git a/assets/img/provider/qwant.jpg b/assets/img/provider/qwant.jpg deleted file mode 100644 index f2f1c432..00000000 Binary files a/assets/img/provider/qwant.jpg and /dev/null differ diff --git a/assets/img/provider/runbox.png b/assets/img/provider/runbox.png index e27d1414..c8eaf228 100644 Binary files a/assets/img/provider/runbox.png and b/assets/img/provider/runbox.png differ diff --git a/assets/img/provider/searx.jpg b/assets/img/provider/searx.jpg deleted file mode 100644 index f280b24c..00000000 Binary files a/assets/img/provider/searx.jpg and /dev/null differ diff --git a/assets/img/provider/searx.png b/assets/img/provider/searx.png new file mode 100644 index 00000000..7701eede Binary files /dev/null and b/assets/img/provider/searx.png differ diff --git a/assets/img/provider/vpnarea.png b/assets/img/provider/vpnarea.png deleted file mode 100644 index ccbffa48..00000000 Binary files a/assets/img/provider/vpnarea.png and /dev/null differ diff --git a/assets/img/qr/BCH.png b/assets/img/qr/BCH.png index f0250c47..79665ff7 100644 Binary files a/assets/img/qr/BCH.png and b/assets/img/qr/BCH.png differ diff --git a/assets/img/qr/BTC.png b/assets/img/qr/BTC.png index 3567770e..a991acf3 100644 Binary files a/assets/img/qr/BTC.png and b/assets/img/qr/BTC.png differ diff --git a/assets/img/qr/ETH.png b/assets/img/qr/ETH.png index 0e42d2bb..cdc65fa6 100644 Binary files a/assets/img/qr/ETH.png and b/assets/img/qr/ETH.png differ diff --git a/assets/img/qr/LTC.png b/assets/img/qr/LTC.png index e554ccdc..a22f0076 100644 Binary files a/assets/img/qr/LTC.png and b/assets/img/qr/LTC.png differ diff --git a/assets/img/qr/XLM.png b/assets/img/qr/XLM.png index 5b1bd286..6df37ed3 100644 Binary files a/assets/img/qr/XLM.png and b/assets/img/qr/XLM.png differ diff --git a/assets/img/qr/XMR.png b/assets/img/qr/XMR.png index e356b6cf..6b559219 100644 Binary files a/assets/img/qr/XMR.png and b/assets/img/qr/XMR.png differ diff --git a/assets/img/qr/ZEC.png b/assets/img/qr/ZEC.png index 44cf7577..b3d7f42c 100644 Binary files a/assets/img/qr/ZEC.png and b/assets/img/qr/ZEC.png differ diff --git a/assets/img/tools/Bitcoin.png b/assets/img/tools/Bitcoin.png index 1736ac40..dda5a44e 100644 Binary files a/assets/img/tools/Bitcoin.png and b/assets/img/tools/Bitcoin.png differ diff --git a/assets/img/tools/Bitmessage.png b/assets/img/tools/Bitmessage.png index 4d93e0b8..c9de56c9 100644 Binary files a/assets/img/tools/Bitmessage.png and b/assets/img/tools/Bitmessage.png differ diff --git a/assets/img/tools/Brave.png b/assets/img/tools/Brave.png deleted file mode 100644 index 7db9e730..00000000 Binary files a/assets/img/tools/Brave.png and /dev/null differ diff --git a/assets/img/tools/Claws-Mail.png b/assets/img/tools/Claws-Mail.png index 835736ba..11b6cfd3 100644 Binary files a/assets/img/tools/Claws-Mail.png and b/assets/img/tools/Claws-Mail.png differ diff --git a/assets/img/tools/CopperheadOS.png b/assets/img/tools/CopperheadOS.png deleted file mode 100644 index 5d4fdd63..00000000 Binary files a/assets/img/tools/CopperheadOS.png and /dev/null differ diff --git a/assets/img/tools/DNSCrypt-Proxy.png b/assets/img/tools/DNSCrypt-Proxy.png new file mode 100644 index 00000000..ce6a09fc Binary files /dev/null and b/assets/img/tools/DNSCrypt-Proxy.png differ diff --git a/assets/img/tools/DNSCrypt.png b/assets/img/tools/DNSCrypt.png deleted file mode 100644 index 1fe0557a..00000000 Binary files a/assets/img/tools/DNSCrypt.png and /dev/null differ diff --git a/assets/img/tools/Debian.png b/assets/img/tools/Debian.png index 79eff92d..be496b8b 100644 Binary files a/assets/img/tools/Debian.png and b/assets/img/tools/Debian.png differ diff --git a/assets/img/tools/Etherpad.png b/assets/img/tools/Etherpad.png index 0bebe2d5..350701ec 100644 Binary files a/assets/img/tools/Etherpad.png and b/assets/img/tools/Etherpad.png differ diff --git a/assets/img/tools/F-Droid.png b/assets/img/tools/F-Droid.png index 8651e965..6454798c 100644 Binary files a/assets/img/tools/F-Droid.png and b/assets/img/tools/F-Droid.png differ diff --git a/assets/img/tools/Fedora.png b/assets/img/tools/Fedora.png new file mode 100644 index 00000000..52065868 Binary files /dev/null and b/assets/img/tools/Fedora.png differ diff --git a/assets/img/tools/Firefox-Send.png b/assets/img/tools/Firefox-Send.png index edd9c020..e5e11152 100644 Binary files a/assets/img/tools/Firefox-Send.png and b/assets/img/tools/Firefox-Send.png differ diff --git a/assets/img/tools/Firefox.png b/assets/img/tools/Firefox.png index 848adc63..195a14ae 100644 Binary files a/assets/img/tools/Firefox.png and b/assets/img/tools/Firefox.png differ diff --git a/assets/img/tools/Freenet.png b/assets/img/tools/Freenet.png index 293569ef..5f25de59 100644 Binary files a/assets/img/tools/Freenet.png and b/assets/img/tools/Freenet.png differ diff --git a/assets/img/tools/Friendica.png b/assets/img/tools/Friendica.png index f449fb3e..2edb93f2 100644 Binary files a/assets/img/tools/Friendica.png and b/assets/img/tools/Friendica.png differ diff --git a/assets/img/tools/GnuPG.png b/assets/img/tools/GnuPG.png index ad2b8679..1dc2b869 100644 Binary files a/assets/img/tools/GnuPG.png and b/assets/img/tools/GnuPG.png differ diff --git a/assets/img/tools/GrapheneOS.png b/assets/img/tools/GrapheneOS.png index b6e8591d..8cefd08f 100644 Binary files a/assets/img/tools/GrapheneOS.png and b/assets/img/tools/GrapheneOS.png differ diff --git a/assets/img/tools/I2P.png b/assets/img/tools/I2P.png index de0f250d..b586f653 100644 Binary files a/assets/img/tools/I2P.png and b/assets/img/tools/I2P.png differ diff --git a/assets/img/tools/Joplin.png b/assets/img/tools/Joplin.png index bcf2465c..0278f349 100644 Binary files a/assets/img/tools/Joplin.png and b/assets/img/tools/Joplin.png differ diff --git a/assets/img/tools/KNOPPIX.png b/assets/img/tools/KNOPPIX.png index 0f3d3feb..2d97e21d 100644 Binary files a/assets/img/tools/KNOPPIX.png and b/assets/img/tools/KNOPPIX.png differ diff --git a/assets/img/tools/KeePass.png b/assets/img/tools/KeePass.png deleted file mode 100644 index 0c2e6c3c..00000000 Binary files a/assets/img/tools/KeePass.png and /dev/null differ diff --git a/assets/img/tools/LessPass.png b/assets/img/tools/LessPass.png index e5b0e147..6d295304 100644 Binary files a/assets/img/tools/LessPass.png and b/assets/img/tools/LessPass.png differ diff --git a/assets/img/tools/LibreCMC.png b/assets/img/tools/LibreCMC.png index 3f7e096b..bef5467e 100644 Binary files a/assets/img/tools/LibreCMC.png and b/assets/img/tools/LibreCMC.png differ diff --git a/assets/img/tools/LibreWRT.png b/assets/img/tools/LibreWRT.png deleted file mode 100644 index 7be2befa..00000000 Binary files a/assets/img/tools/LibreWRT.png and /dev/null differ diff --git a/assets/img/tools/LineageOS.png b/assets/img/tools/LineageOS.png index 5f985f72..c978c9e3 100644 Binary files a/assets/img/tools/LineageOS.png and b/assets/img/tools/LineageOS.png differ diff --git a/assets/img/tools/Linphone.png b/assets/img/tools/Linphone.png index de8a1288..995a6e52 100644 Binary files a/assets/img/tools/Linphone.png and b/assets/img/tools/Linphone.png differ diff --git a/assets/img/tools/MAT2.png b/assets/img/tools/MAT2.png new file mode 100644 index 00000000..060e00a6 Binary files /dev/null and b/assets/img/tools/MAT2.png differ diff --git a/assets/img/tools/Magic-Wormhole.png b/assets/img/tools/Magic-Wormhole.png index 3acdec9f..3c11b5b1 100644 Binary files a/assets/img/tools/Magic-Wormhole.png and b/assets/img/tools/Magic-Wormhole.png differ diff --git a/assets/img/tools/Mastodon.png b/assets/img/tools/Mastodon.png index 0c7f9185..45476eae 100644 Binary files a/assets/img/tools/Mastodon.png and b/assets/img/tools/Mastodon.png differ diff --git a/assets/img/tools/Mumble.png b/assets/img/tools/Mumble.png new file mode 100644 index 00000000..a8967387 Binary files /dev/null and b/assets/img/tools/Mumble.png differ diff --git a/assets/img/tools/OnionShare.png b/assets/img/tools/OnionShare.png index a47194dd..29747408 100644 Binary files a/assets/img/tools/OnionShare.png and b/assets/img/tools/OnionShare.png differ diff --git a/assets/img/tools/OpenNIC.png b/assets/img/tools/OpenNIC.png index c4a80f84..32850d06 100644 Binary files a/assets/img/tools/OpenNIC.png and b/assets/img/tools/OpenNIC.png differ diff --git a/assets/img/tools/OpenWrt.png b/assets/img/tools/OpenWrt.png index 59290cae..4f2ce2b2 100644 Binary files a/assets/img/tools/OpenWrt.png and b/assets/img/tools/OpenWrt.png differ diff --git a/assets/img/tools/PeaZip.png b/assets/img/tools/PeaZip.png index e9e940a9..4a147e31 100644 Binary files a/assets/img/tools/PeaZip.png and b/assets/img/tools/PeaZip.png differ diff --git a/assets/img/tools/PrivateBin.png b/assets/img/tools/PrivateBin.png index 0e46c1b7..df1b0caf 100644 Binary files a/assets/img/tools/PrivateBin.png and b/assets/img/tools/PrivateBin.png differ diff --git a/assets/img/tools/Puppy-Linux.png b/assets/img/tools/Puppy-Linux.png index 7b3c8b15..0e6f5f5f 100644 Binary files a/assets/img/tools/Puppy-Linux.png and b/assets/img/tools/Puppy-Linux.png differ diff --git a/assets/img/tools/Purism.png b/assets/img/tools/Purism.png deleted file mode 100644 index 6acfc5dc..00000000 Binary files a/assets/img/tools/Purism.png and /dev/null differ diff --git a/assets/img/tools/Pydio.png b/assets/img/tools/Pydio.png index 03a5a282..c4a88096 100644 Binary files a/assets/img/tools/Pydio.png and b/assets/img/tools/Pydio.png differ diff --git a/assets/img/tools/Qubes-OS.png b/assets/img/tools/Qubes-OS.png index df4afc67..27718c6e 100644 Binary files a/assets/img/tools/Qubes-OS.png and b/assets/img/tools/Qubes-OS.png differ diff --git a/assets/img/tools/RetroShare.png b/assets/img/tools/RetroShare.png index a17b1f79..8fc2ebf2 100644 Binary files a/assets/img/tools/RetroShare.png and b/assets/img/tools/RetroShare.png differ diff --git a/assets/img/tools/Ricochet.png b/assets/img/tools/Ricochet.png deleted file mode 100644 index 2b2df143..00000000 Binary files a/assets/img/tools/Ricochet.png and /dev/null differ diff --git a/assets/img/tools/Riot.png b/assets/img/tools/Riot.png deleted file mode 100644 index 92c58bb4..00000000 Binary files a/assets/img/tools/Riot.png and /dev/null differ diff --git a/assets/img/tools/Sailfish-OS.png b/assets/img/tools/Sailfish-OS.png deleted file mode 100644 index 7cff0e09..00000000 Binary files a/assets/img/tools/Sailfish-OS.png and /dev/null differ diff --git a/assets/img/tools/Signal.png b/assets/img/tools/Signal.png index 08b1f740..ae3ed8dd 100644 Binary files a/assets/img/tools/Signal.png and b/assets/img/tools/Signal.png differ diff --git a/assets/img/tools/SparkleShare.png b/assets/img/tools/SparkleShare.png index 78297565..2e94b6a5 100644 Binary files a/assets/img/tools/SparkleShare.png and b/assets/img/tools/SparkleShare.png differ diff --git a/assets/img/tools/StandardNotes.png b/assets/img/tools/StandardNotes.png index d2877945..8e6f6e59 100644 Binary files a/assets/img/tools/StandardNotes.png and b/assets/img/tools/StandardNotes.png differ diff --git a/assets/img/tools/Syncthing.png b/assets/img/tools/Syncthing.png index b48ce7b1..117e9630 100644 Binary files a/assets/img/tools/Syncthing.png and b/assets/img/tools/Syncthing.png differ diff --git a/assets/img/tools/Tahoe-LAFS.png b/assets/img/tools/Tahoe-LAFS.png index 589f0b7c..8da91dce 100644 Binary files a/assets/img/tools/Tahoe-LAFS.png and b/assets/img/tools/Tahoe-LAFS.png differ diff --git a/assets/img/tools/Tails.png b/assets/img/tools/Tails.png index 25163382..cad6a3cc 100644 Binary files a/assets/img/tools/Tails.png and b/assets/img/tools/Tails.png differ diff --git a/assets/img/tools/Thunderbird.png b/assets/img/tools/Thunderbird.png index d75a3353..0eb13f64 100644 Binary files a/assets/img/tools/Thunderbird.png and b/assets/img/tools/Thunderbird.png differ diff --git a/assets/img/tools/Tor-Browser.png b/assets/img/tools/Tor-Browser.png index 8b6a94b8..617e800b 100644 Binary files a/assets/img/tools/Tor-Browser.png and b/assets/img/tools/Tor-Browser.png differ diff --git a/assets/img/tools/Tor-Project.png b/assets/img/tools/Tor-Project.png index eef65370..2409e50d 100644 Binary files a/assets/img/tools/Tor-Project.png and b/assets/img/tools/Tor-Project.png differ diff --git a/assets/img/tools/Trisquel.png b/assets/img/tools/Trisquel.png deleted file mode 100644 index 82db24b2..00000000 Binary files a/assets/img/tools/Trisquel.png and /dev/null differ diff --git a/assets/img/tools/Turtl.png b/assets/img/tools/Turtl.png index e11d97a7..beccd0d0 100644 Binary files a/assets/img/tools/Turtl.png and b/assets/img/tools/Turtl.png differ diff --git a/assets/img/tools/Ubuntu-Touch.png b/assets/img/tools/Ubuntu-Touch.png index a2823e56..9e94d17e 100644 Binary files a/assets/img/tools/Ubuntu-Touch.png and b/assets/img/tools/Ubuntu-Touch.png differ diff --git a/assets/img/tools/VeraCrypt.png b/assets/img/tools/VeraCrypt.png index 138f9e0b..07ffd118 100644 Binary files a/assets/img/tools/VeraCrypt.png and b/assets/img/tools/VeraCrypt.png differ diff --git a/assets/img/tools/WriteAs.png b/assets/img/tools/WriteAs.png index c0821dd9..309b87ff 100644 Binary files a/assets/img/tools/WriteAs.png and b/assets/img/tools/WriteAs.png differ diff --git a/assets/img/tools/ZeroBin.png b/assets/img/tools/ZeroBin.png index 58d88565..e5944ac0 100644 Binary files a/assets/img/tools/ZeroBin.png and b/assets/img/tools/ZeroBin.png differ diff --git a/assets/img/tools/aether.png b/assets/img/tools/aether.png index 0b3dfcc4..186d70af 100644 Binary files a/assets/img/tools/aether.png and b/assets/img/tools/aether.png differ diff --git a/assets/img/tools/bitwarden.png b/assets/img/tools/bitwarden.png index 7265debb..035dcb19 100644 Binary files a/assets/img/tools/bitwarden.png and b/assets/img/tools/bitwarden.png differ diff --git a/assets/img/tools/diaspora.png b/assets/img/tools/diaspora.png index 151bd99a..7da5e8b5 100644 Binary files a/assets/img/tools/diaspora.png and b/assets/img/tools/diaspora.png differ diff --git a/assets/img/tools/keepassxc.png b/assets/img/tools/keepassxc.png new file mode 100644 index 00000000..c3cfaa9c Binary files /dev/null and b/assets/img/tools/keepassxc.png differ diff --git a/assets/img/tools/keybase.png b/assets/img/tools/keybase.png index d8081eec..b45ebfb0 100644 Binary files a/assets/img/tools/keybase.png and b/assets/img/tools/keybase.png differ diff --git a/assets/img/tools/pfSense.png b/assets/img/tools/pfSense.png index b081594d..b0707896 100644 Binary files a/assets/img/tools/pfSense.png and b/assets/img/tools/pfSense.png differ diff --git a/assets/img/tools/raddle.png b/assets/img/tools/raddle.png index 78c04487..e0385594 100644 Binary files a/assets/img/tools/raddle.png and b/assets/img/tools/raddle.png differ diff --git a/assets/img/tools/rocket.chat.png b/assets/img/tools/rocket.chat.png index 904efe19..8577007f 100644 Binary files a/assets/img/tools/rocket.chat.png and b/assets/img/tools/rocket.chat.png differ diff --git a/assets/img/tools/tildes.png b/assets/img/tools/tildes.png index 5bbb8c8d..cd8c870c 100644 Binary files a/assets/img/tools/tildes.png and b/assets/img/tools/tildes.png differ diff --git a/assets/img/tools/wire.png b/assets/img/tools/wire.png index 560618f9..abae18c8 100644 Binary files a/assets/img/tools/wire.png and b/assets/img/tools/wire.png differ diff --git a/assets/js/applytheme.js b/assets/js/applytheme.js new file mode 100644 index 00000000..1392dd66 --- /dev/null +++ b/assets/js/applytheme.js @@ -0,0 +1,6 @@ +if (localStorage.getItem("colorScheme") === "dark") { + document.querySelector("#dark-css").removeAttribute("media"); // Set dark theme +} +else if (localStorage.getItem("colorScheme") === "light") { + document.querySelector("#dark-css").setAttribute("media", "invalid"); // Set light theme +} diff --git a/assets/js/main.js b/assets/js/main.js new file mode 100644 index 00000000..67738c1a --- /dev/null +++ b/assets/js/main.js @@ -0,0 +1,89 @@ +$(function() { + $("[data-toggle='tooltip']").tooltip(); +}); + +// Navbar dropdowns +const navSections = document.querySelectorAll(".nav-details"); + +navSections.forEach(navSection => { + navSection.addEventListener("toggle", navSectionsToggle); +}); +document.addEventListener("click", navSectionsClose); + +function navSectionsToggle() { + // When opening next dropdown, hide previous + if (this.open) { + navSections.forEach(navSection => { + if (navSection != this && navSection.open) navSection.open = !open; + }); + } +} + +function navSectionsClose(event) { + // Hide all dropdowns when clicking in different place + if (event.target.matches(".nav-summary")) return; + navSections.forEach(navSection => { + navSection.open = !open; + }); +} + + +// Dark/Light color scheme switch button +document.querySelector("#nav-switch-theme").style.display = "inline"; + +function changeColorScheme() { + // Use whatever users want + if (localStorage.getItem("colorScheme") === "dark") { + // Change to light theme + if (window.matchMedia("(prefers-color-scheme: dark)").matches === false) { + document.querySelector("#dark-css").setAttribute("media", "(prefers-color-scheme: dark)"); + localStorage.removeItem("colorScheme"); + } else { + // by setting invalid media it will just not apply CSS for anyone + document.querySelector("#dark-css").setAttribute("media", "invalid"); + localStorage.setItem("colorScheme", "light"); + } + } + // Change to dark theme + else if (localStorage.getItem("colorScheme") === "light") { + if (window.matchMedia("(prefers-color-scheme: dark)").matches === true) { + document.querySelector("#dark-css").setAttribute("media", "(prefers-color-scheme: dark)"); + localStorage.removeItem("colorScheme"); + } else { + // media was set to prefers-color-scheme: dark + document.querySelector("#dark-css").removeAttribute("media"); + localStorage.setItem("colorScheme", "dark"); + } + } + + // Just use whatever browsers want + else if (window.matchMedia("(prefers-color-scheme: dark)").matches === true) { + // Change to light Theme + document.querySelector("#dark-css").setAttribute("media", "invalid"); + localStorage.setItem("colorScheme", "light"); + } else { + // Change to dark theme + document.querySelector("#dark-css").removeAttribute("media"); + localStorage.setItem("colorScheme", "dark"); + } +} + + +// Matomo +var _paq = window._paq || []; +/* tracker methods like "setCustomDimension" should be called before "trackPageView" */ +_paq.push(["trackPageView"]); +_paq.push(["enableLinkTracking"]); +(function() { + var u = "https://stats.privacytools.io/"; + _paq.push(["setTrackerUrl", u + "matomo.php"]); + _paq.push(["setSiteId", "1"]); + var d = document, + g = d.createElement("script"), + s = d.getElementsByTagName("script")[0]; + g.type = "text/javascript"; + g.async = true; + g.defer = true; + g.src = u + "matomo.js"; + s.parentNode.insertBefore(g, s); +})(); diff --git a/assets/webfonts/ptio-font-preview.html b/assets/webfonts/ptio-font-preview.html new file mode 100644 index 00000000..b7608ff7 --- /dev/null +++ b/assets/webfonts/ptio-font-preview.html @@ -0,0 +1,309 @@ + + + + ptio-font glyphs preview + + + + + + + + + +
      +
      +

      ptio-font contains 7 glyphs:

      + Toggle Preview Characters +
      + + +
      +
      + PpPpPpPpPpPpPpPpPpPp +
      +
      + 12141618212436486072 +
      +
      + + +
      +
      + +
      +
      + PpPpPpPpPpPpPpPpPpPp +
      +
      + 12141618212436486072 +
      +
      + + +
      +
      + +
      +
      + PpPpPpPpPpPpPpPpPpPp +
      +
      + 12141618212436486072 +
      +
      + + +
      +
      + +
      +
      + PpPpPpPpPpPpPpPpPpPp +
      +
      + 12141618212436486072 +
      +
      + + +
      +
      + +
      +
      + PpPpPpPpPpPpPpPpPpPp +
      +
      + 12141618212436486072 +
      +
      + + +
      +
      + +
      +
      + PpPpPpPpPpPpPpPpPpPp +
      +
      + 12141618212436486072 +
      +
      + + +
      +
      + +
      +
      + PpPpPpPpPpPpPpPpPpPp +
      +
      + 12141618212436486072 +
      +
      + + +
      +
      + + + +
      + + diff --git a/assets/webfonts/ptio-font.eot b/assets/webfonts/ptio-font.eot new file mode 100644 index 00000000..da3e19b0 Binary files /dev/null and b/assets/webfonts/ptio-font.eot differ diff --git a/assets/webfonts/ptio-font.svg b/assets/webfonts/ptio-font.svg new file mode 100644 index 00000000..85940b6e --- /dev/null +++ b/assets/webfonts/ptio-font.svg @@ -0,0 +1,147 @@ + + + + + +Created by FontForge 20190801 at Tue Sep 10 20:23:41 2019 + By Dawid Potocki + + + + + + + + + + + + + + + + diff --git a/assets/webfonts/ptio-font.ttf b/assets/webfonts/ptio-font.ttf new file mode 100644 index 00000000..92f93e55 Binary files /dev/null and b/assets/webfonts/ptio-font.ttf differ diff --git a/assets/webfonts/ptio-font.woff b/assets/webfonts/ptio-font.woff new file mode 100644 index 00000000..8cb1c763 Binary files /dev/null and b/assets/webfonts/ptio-font.woff differ diff --git a/assets/webfonts/ptio-font.woff2 b/assets/webfonts/ptio-font.woff2 new file mode 100644 index 00000000..bd2cdebd Binary files /dev/null and b/assets/webfonts/ptio-font.woff2 differ diff --git a/contact.md b/contact.md index c4d02145..50a49f09 100644 --- a/contact.md +++ b/contact.md @@ -17,7 +17,7 @@ It's very important to us to stay up-to-date on the latest changes in the privac For complete transparency, software and providers will only be considered for this website after discussions take place on either of the above platforms. - New: We're now on Matrix! Join us at `#general:privacytools.io` to chat with us and other members about this site and privacy in general. If you need a Matrix account, you can sign up with our own homeserver (`https://chat.privacytools.io`) using [riot.privacytools.io](https://riot.privacytools.io/) or any Matrix client! If you prefer XMPP, you're welcome to [use the Matrix.org XMPP bridge to join the discussion](https://conversations.im/j/%23general%23privacytools.io@bridge.xmpp.matrix.org). +We're on Matrix! Join us at `#general:privacytools.io` to chat with us and other members about this site and privacy in general. If you need a Matrix account, you can sign up with our own homeserver (`https://chat.privacytools.io`) using [riot.privacytools.io](https://riot.privacytools.io/) or any Matrix client! ## Abuse diff --git a/font/Gemfile b/font/Gemfile new file mode 100644 index 00000000..6e854e65 --- /dev/null +++ b/font/Gemfile @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +source "https://rubygems.org" + +gem "fontcustom", "~> 2.0" diff --git a/font/Gemfile.lock b/font/Gemfile.lock new file mode 100644 index 00000000..0ace0a2a --- /dev/null +++ b/font/Gemfile.lock @@ -0,0 +1,27 @@ +GEM + remote: https://rubygems.org/ + specs: + ffi (1.11.1) + fontcustom (2.0.0) + json (~> 1.4) + listen (>= 1.0, < 4.0) + thor (~> 0.14) + json (1.8.6) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + ruby_dep (1.5.0) + thor (0.20.3) + +PLATFORMS + ruby + +DEPENDENCIES + fontcustom (~> 2.0) + +BUNDLED WITH + 2.0.1 diff --git a/font/LICENSE b/font/LICENSE new file mode 100644 index 00000000..b5d0c56e --- /dev/null +++ b/font/LICENSE @@ -0,0 +1,13 @@ +Copyright (c) 2019, Dawid Potocki + +Permission to use, copy, modify, and distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/font/Makefile b/font/Makefile new file mode 100644 index 00000000..c1ceb61a --- /dev/null +++ b/font/Makefile @@ -0,0 +1,11 @@ +build: + bundle exec fontcustom compile -F + mv ptio-font.woff assets/webfonts + mv _sass/ptio-font.css ../_sass/ptio-font.scss + mv assets/webfonts/* ../assets/webfonts/ + sed -i -e 's/..\/assets\//..\//g' ../_sass/ptio-font.scss + +default: + build + +.PHONY: build diff --git a/font/README.md b/font/README.md new file mode 100644 index 00000000..769b1312 --- /dev/null +++ b/font/README.md @@ -0,0 +1,39 @@ +# ptio-font + +This font contains icons we need, which Font Awesome does not have. + +| Name | CSS class | Issue | +|--- |--- |--- | +| F-Droid | `ptio-f-droid` | https://github.com/FortAwesome/Font-Awesome/issues/15492 | +| iOS | `ptio-ios` | https://github.com/FortAwesome/Font-Awesome/issues/4935 | +| macOS | `ptio-macos` | https://github.com/FortAwesome/Font-Awesome/issues/4936 | +| OpenBSD | `ptio-openbsd` | https://github.com/FortAwesome/Font-Awesome/issues/5345 | +| NetBSD | `ptio-netbsd` | https://github.com/FortAwesome/Font-Awesome/issues/15496 | +| Sailfish OS | `ptio-sailfish-os` | https://github.com/FortAwesome/Font-Awesome/issues/15498 | + +We also have custom Linux icon (`ptio-linux`), because I (@dawidpotocki) made it before and looks cleaner. +And since we are bundling additional font anyway, why not. + +## Building + +To build the font, you will need some of the following tools installed. + +| Name | Notes | +|--- |--- | +| `make` | Use distro's package manager | +| `ruby` | Use distro's package manager | +| `bundler` | Run `gem install bundler` | +| | | +| | | +| `woff-tools` | Use distro's package manager | +| or | | +| `yarn` or `npm` | Use distro's package manager | +| `sfnt2woff` | Run `yarn global add sfnt2woff` or `npm install -g sfnt2woff` | + +Then just run the following commands to build the font: + +``` +$ cd font/ +$ bundle # it will install FontCustom +$ make build # it will build a font and css +``` diff --git a/font/fontcustom.yml b/font/fontcustom.yml new file mode 100644 index 00000000..22594e09 --- /dev/null +++ b/font/fontcustom.yml @@ -0,0 +1,15 @@ +font_name: ptio-font +css_selector: .ptio-{{glyph}} +preprocessor_path: "" +autowidth: false +no_hash: true +force: false +debug: false +quiet: false + +input: + vectors: svg + +output: + fonts: assets/webfonts + css: _sass diff --git a/font/svg/f-droid.svg b/font/svg/f-droid.svg new file mode 100644 index 00000000..de1391b2 --- /dev/null +++ b/font/svg/f-droid.svg @@ -0,0 +1,2 @@ + + diff --git a/font/svg/ios.svg b/font/svg/ios.svg new file mode 100644 index 00000000..1be11979 --- /dev/null +++ b/font/svg/ios.svg @@ -0,0 +1,2 @@ + + diff --git a/font/svg/linux.svg b/font/svg/linux.svg new file mode 100644 index 00000000..9649ed4f --- /dev/null +++ b/font/svg/linux.svg @@ -0,0 +1,2 @@ + + diff --git a/font/svg/macos.svg b/font/svg/macos.svg new file mode 100644 index 00000000..97b0f62c --- /dev/null +++ b/font/svg/macos.svg @@ -0,0 +1,2 @@ + + diff --git a/font/svg/netbsd.svg b/font/svg/netbsd.svg new file mode 100644 index 00000000..f98c870c --- /dev/null +++ b/font/svg/netbsd.svg @@ -0,0 +1,2 @@ + + diff --git a/font/svg/openbsd.svg b/font/svg/openbsd.svg new file mode 100644 index 00000000..ba4f968b --- /dev/null +++ b/font/svg/openbsd.svg @@ -0,0 +1,2 @@ + + diff --git a/font/svg/sailfish-os.svg b/font/svg/sailfish-os.svg new file mode 100644 index 00000000..1f77e6eb --- /dev/null +++ b/font/svg/sailfish-os.svg @@ -0,0 +1,2 @@ + + diff --git a/pages/old.html b/pages/old.html index ee7cc30b..554a8017 100644 --- a/pages/old.html +++ b/pages/old.html @@ -41,6 +41,8 @@ permalink: /classic/ {% include sections/voice-video-messenger.html %} +{% include sections/teamchat.html %} + {% include sections/file-sharing.html %} {% include sections/cloud-storage.html %} diff --git a/pages/providers.html b/pages/providers.html index a27be1d6..e78f9a4a 100644 --- a/pages/providers.html +++ b/pages/providers.html @@ -11,13 +11,15 @@ description: "There's a ton of people providing services online. Discover which
      @@ -25,4 +27,4 @@ description: "There's a ton of people providing services online. Discover which {% include sections/key-disclosure-law.html %} -{% include sections/warrant-canary.html %} \ No newline at end of file +{% include sections/warrant-canary.html %} diff --git a/pages/providers/vpn.html b/pages/providers/vpn.html index 8c76475d..5db0b47e 100644 --- a/pages/providers/vpn.html +++ b/pages/providers/vpn.html @@ -20,6 +20,118 @@ description: "Find a no-logging VPN operator who isn't out to sell or read your {% include sections/vpn.html %} +
      +

      Our VPN Provider Criteria

      + +

      Please note we are not affiliated with any of the providers we recommend. This allows us to provide completely objective recommendations. We have developed a clear set of requirements for any VPN provider wishing to be recommended, including strong encryption, independent security audits, modern technology, and more. We suggest you familiarize yourself with this list before choosing a VPN provider, and conduct your own research to ensure the VPN provider you choose is as trustworthy as possible.

      + +
      +
      +
      +

      Jurisdiction

      +

      Operating outside the five/nine/fourteen-eyes countries is not a guarantee of privacy necessarily, and there are other factors to consider. However, we believe that avoiding these countries is important if you wish to avoid mass government dragnet surveillance, especially from the United States. Read our page on global mass surveillance and avoiding the US and UK to learn more about why we feel this is important.

      +
      +
      +

      Minimum to Qualify:

      +
        +
      • Operating outside the USA or other Five Eyes countries.
        • +
      +
      +
      +

      Best Case:

      +
        +
      • Operating outside the USA or other Fourteen Eyes countries.
        • +
      • Operating inside a country with strong consumer protection laws.
        • +
      +
      + +
      +

      Technology

      +

      We require all our recommended VPN providers to provide OpenVPN configuration files to be used in any client. If a VPN provides their own custom client, we require a kill-switch to block network data leaks when disconnected.

      +
      +
      +

      Minimum to Qualify:

      +
        +
      • OpenVPN support.
        • +
      • Kill switch built in to clients.
        • +
      +
      +
      +

      Best Case:

      +
        +
      • OpenVPN and Wireguard support.
        • +
      • Kill-switch with highly configurable options (enable/disable on certain networks, on boot, etc.)
        • +
      • Easy-to-use mobile clients, especially open-source.
        • +
      +
      + +
      +

      Anonymity

      +

      We prefer our recommended providers to collect as little data as possible. Not collecting personal information on registration, and accepting anonymous forms of payment are required.

      +
      +
      +

      Minimum to Qualify:

      +
        +
      • Bitcoin or cash payment option.
        • +
      • No personal information required to register: Only username, password, and email at most.
        • +
      +
      +
      +

      Best Case:

      +
        +
      • Accepts Bitcoin, cash, and other forms of cryptocurrency and/or anonymous payment options (gift cards, etc.)
        • +
      • No personal information accepted (autogenerated username, no email required, etc.)
        • +
      +
      + +
      +

      Security

      +

      A VPN is pointless if it can't even provide adequate security. We require all our recommended providers to abide by current security standards for their OpenVPN connections. Ideally, they would use more future-proof encryption schemes by default. We also require an independent third-party to audit the provider's security. Ideally in a very comprehensive manner and on a repeated (yearly) basis.

      +
      +
      +

      Minimum to Qualify:

      +
        +
      • Strong Encryption Schemes: OpenVPN with SHA-256 authentication; RSA-2048 or better handshake; AES-256-GCM or AES-256-CBC data encryption.
        • +
      • Perfect Forward Secrecy (PFS).
        • +
      • Published security audits from a reputable third-party firm.
        • +
      +
      +
      +

      Best Case:

      +
        +
      • Strongest Encryption: RSA-4096.
        • +
      • Perfect Forward Secrecy (PFS).
        • +
      • Comprehensive published security audits from a reputable third-party firm.
        • +
      • Bug-bounty programs and/or a coordinated vulnerability-disclosure process
        • +
      +
      + +
      +

      Trust

      +

      You wouldn't trust your finances to someone with a fake identity, so why trust them with your internet data? We require our recommended providers to be public about their ownership or leadership. We also would like to see frequent transparency reports, especially in regard to how government requests are handled.

      +
      +
      +

      Minimum to Qualify:

      +
        +
      • Public-facing leadership or ownership.
        • +
      +
      +
      +

      Best Case:

      +
        +
      • Public-facing leadership.
        • +
      • Frequent transparency reports.
        • +
      +
      + +
      +

      Additional Functionality

      +

      While not strictly requirements, there are some factors we looked into when determining which providers to recommend. These include adblocking/tracker-blocking functionality, warrant canaries, multihop connections, excellent customer support, the number of allowed simultaneous connections, etc.

      +
      +
      +
      +
      +

      Further Information and Dangers

      @@ -61,3 +173,34 @@ description: "Find a no-logging VPN operator who isn't out to sell or read your

    + +
    + +
    +
    +
    + +

    More VPN Providers

    + +
    + +
    + +

    Related VPN information

    + + + +
    +
    +
    diff --git a/pages/software.html b/pages/software.html index 4386be18..1c1d74ef 100644 --- a/pages/software.html +++ b/pages/software.html @@ -9,18 +9,17 @@ description: "Discover a variety of open source software built to protect your p
    diff --git a/source_code.md b/source_code.md index fcff6d0b..91af2393 100644 --- a/source_code.md +++ b/source_code.md @@ -13,8 +13,6 @@ https://github.com/privacytoolsIO/ Firefox: https://hg.mozilla.org/ - Brave: https://github.com/brave/ - ## Excellent Firefox Privacy Add-ons Privacy Badger: https://github.com/EFForg/privacybadger @@ -134,7 +132,9 @@ Backend: closed-source Status.im: https://github.com/status-im - Ricochet: https://github.com/ricochet-im/ricochet + Tox: https://github.com/TokTok/c-toxcore + + Ring/Jami: https://git.jami.net/savoirfairelinux ## Team chat @@ -142,20 +142,14 @@ Backend: closed-source Keybase: https://github.com/Keybase -## Encrypted Video & Voice Messenger - Signal: https://github.com/signalapp - - Wire: https://github.com/wireapp - +## Video & Voice Messenger Linphone: https://github.com/BelledonneCommunications/ + Mumble: https://github.com/mumble-voip/ + Worth Mentioning - Jitsi: https://github.com/jitsi/jitsi-meet - - Tox: https://github.com/TokTok/c-toxcore - - Ring/Jami: https://gerrit-ring.savoirfairelinux.com/#/q/status:open + Jitsi Meet: https://github.com/jitsi/jitsi-meet ## File Sharing OnionShare: https://github.com/micahflee/onionshare @@ -191,49 +185,49 @@ Backend: closed-source git-annex: http://source.git-annex.branchable.com/?p=source.git;a=summary ## Password Manager Software - Bitwarden: https://github.com/bitwarden - KeePass: https://keepass.info/download.html +Bitwarden: https://github.com/bitwarden - KeePassXC: https://github.com/keepassxreboot +KeePassXC: https://github.com/keepassxreboot - LessPass: https://github.com/lesspass/lesspass +LessPass: https://github.com/lesspass/lesspass - Worth Mentioning -. - Master Password: https://gitlab.com/lhunath/MasterPassword -. - Password Safe: hhttps://sourceforge.net/p/passwordsafe/git-code/ci/master/tree/ +Worth Mentioning + +- Master Password: https://gitlab.com/lhunath/MasterPassword + +- Psono: https://github.com/psono + +- Password Safe: https://sourceforge.net/projects/passwordsafe/files/ ## Calendar and Contacts Sync - Nextcloud: https://github.com/nextcloud - EteSync: https://github.com/etesync +Nextcloud: https://github.com/nextcloud - Worth Mentioning: -. - fruux: https://fruux.com/opensource/ -. - Flock: https://github.com/signalapp/Flock +EteSync: https://github.com/etesync + +Worth Mentioning: + +- fruux: https://fruux.com/opensource/ ## File Encryption Software - VeraCrypt: https://www.veracrypt.fr/en/Source%20Code.html - GNU Privacy Guard: https://github.com/gpg/gnupg +VeraCrypt: https://www.veracrypt.fr/en/Source%20Code.html - PeaZip: https://github.com/giorgiotani/PeaZip/ +GNU Privacy Guard: https://github.com/gpg/gnupg - Cryptomator: https://github.com/cryptomator/cryptomator +PeaZip: https://github.com/giorgiotani/PeaZip/ - Worth Mentioning: +Worth Mentioning: +- Cryptomator: https://github.com/cryptomator/cryptomator - miniLock: https://github.com/kaepora/miniLock +- DiskCryptor: https://github.com/smartinm/diskcryptor - AES Crypt: https://github.com/marcobellaccini/pyAesCrypt +- Linux Unified Key Setup (LUKS): https://gitlab.com/cryptsetup/cryptsetup/ - DiskCryptor: https://github.com/smartinm/diskcryptor +- Hat.sh: https://github.com/sh-dv/hat.sh - Linux Unified Key Setup (LUKS): https://gitlab.com/cryptsetup/cryptsetup/ +- Keka: https://www.keka.io/ ## Self-contained Networks TorBrowser: https://gitweb.torproject.org/tor.git @@ -291,20 +285,12 @@ Raddle: https://gitlab.com/postmill Njalla: Non-free/Proprietary Software -DNSCrypt: https://github.com/dnscrypt - -DNSCrypt-proxy: https://github.com/jedisct1/dnscrypt-proxy/ - -OpenNic: https://github.com/opennic/ (mostly) - -Webpage: https://github.com/opennic/opennic-web +DNSCrypt-Proxy: https://github.com/jedisct1/dnscrypt-proxy/ ### Worth Mentioning - NoTrack: https://github.com/quidsup/notrack -- Namecoin: https://github.com/namecoin - - Pi-hole: https://github.com/pi-hole ## Encrypted ICANN DNS Providers @@ -315,14 +301,24 @@ BlahDNS: https://github.com/ookangzheng/blahdns/ CloudFlare DNS: https://github.com/cloudflare/dns +NixNet DNS: https://git.nixnet.xyz/NixNet/dns + PowerDNS: https://github.com/PowerDNS/pdns ### Worth Mentioning and Additional Information +#### Mobile + - DNSCloak: https://github.com/s-s/dnscloak +- Nebulo: https://git.frostnerd.com/PublicAndroidApps/smokescreen/ + +#### Local DNS servers + - Stubby: https://github.com/getdnsapi/stubby +- Unbound: https://github.com/NLnetLabs/unbound + ## Digital Notebook Joplin: https://github.com/laurent22/joplin @@ -352,43 +348,30 @@ PowerDNS: https://github.com/PowerDNS/pdns ## Productivity Tools - Etherpad: https://github.com/ether/etherpad-lite - Write.as: https://code.as/writeas +CryptPad: https://github.com/xwiki-labs/cryptpad - Protected Text: -Frontend:? -Backend: closed-source +Etherpad: https://github.com/ether/etherpad-lite - Worth Mentioning +Write.as: https://code.as/writeas - Cryptee: https://github.com/cryptee -Backend: Closed Source +### Worth Mentioning - EtherCalc: https://github.com/audreyt/ethercalc +- Cryptee: https://github.com/cryptee - Disroot: - Email: - Cloud: https://github.com/nextcloud/server - Diaspora/Social-Network: https://github.com/diaspora/ - Forum: https://github.com/discourse/discourse - Chat: http://hg.prosody.im/ - Pads: https://github.com/ether/etherpad-lite - Pastebin: https://github.com/PrivateBin/PrivateBin via https://disroot.org/en/services/privatebin - Upload: - Lufi: https://framagit.org/fiat-tux/hat-softwares/lufi - Search: - Searx: https://github.com/asciimoo/searx - Polls: - Framadate: https://git.framasoft.org/framasoft/framadate - Project Board: - Taiga: https://github.com/taigaio/ - Website: https://git.fosscommunity.in/disroot/website + some other repositories https://git.fosscommunity.in/disroot/ +- EtherCalc: https://github.com/audreyt/ethercalc +- Disroot: https://git.fosscommunity.in/disroot - Dudle: https://github.com/kellerben/dudle/ +- Dudle: https://github.com/kellerben/dudle/ - LibreOffice: https://gerrit.libreoffice.org/ +- Framadate: https://framagit.org/framasoft/framadate/framadate + +- LibreOffice: https://gerrit.libreoffice.org/ + +- VSCodium: https://github.com/VSCodium/vscodium + +MAT2: https://0xacab.org/jvoisin/mat2 ## PC Operating Systems QubesOS: https://github.com/QubesOS