Merge branch 'master' into delist-ricochet

This commit is contained in:
Jonah Aragon 2019-08-14 10:27:45 -05:00 committed by GitHub
commit db46562b4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
38 changed files with 325 additions and 406 deletions

16
.github/CODEOWNERS vendored
View File

@ -1,11 +1,3 @@
# Administration Related Files
/.well-known/ @JonahAragon
/404.html @JonahAragon
/.github/ @JonahAragon @BurungHantu1605
/LICENSE.txt @JonahAragon @BurungHantu1605
/.travis.yml @Shifterovich
/CNAME @JonahAragon
# Editorial Team
*.md @privacytoolsIO/editorial
/assets/ @privacytoolsIO/editorial
@ -13,5 +5,13 @@
/_includes/sections/ @privacytoolsIO/editorial
/index.html @privacytoolsIO/editorial
# Administration Related Files
/donate.html @JonahAragon @BurungHantu1605
/assets/js/redirects.js @JonahAragon
/.well-known/ @JonahAragon
/404.html @JonahAragon
/.github/ @JonahAragon @BurungHantu1605
/LICENSE.txt @JonahAragon @BurungHantu1605
/.travis.yml @JonahAragon @Shifterovich @nitrohorse
/CNAME @JonahAragon
/nginx/ @JonahAragon

View File

@ -24,9 +24,17 @@ We're trying to keep it simple and promote the best tools, not all of them.
There can be exceptions if no software is available that meet the criteria.
Note: This criteria applies to all of privacytools.io
### Proividers
### Providers
- Prioritize Products by privacy respecting nationality.
### DNS
- supports DoH or DoT (We love DNSCrypt, but there is already https://github.com/DNSCrypt/dnscrypt-resolvers which is directly supported by dnscrypt-proxy, so we don't consider useful to list providers only supporting it).
- supports DNSSEC (https://dnssec.vs.uni-due.de/ can test your current DNS provider).
- doesn't log IP addresses during normal operation (If your suggestion logs, please compare its privacy policy with other servers on our table that keep logs).
- preferably supports QNAME minimization (if you have access to the dig command, `dig +short txt qnamemintest.internet.nl`)
### VPN
- Prioritize Products by privacy respecting nationality.
- Cannot be based in USA or UK.

View File

@ -1,11 +1,47 @@
<div class="card">
<div class="card-header text-white bg-secondary">
<h3 class="h5">{{include.title}}</h3>
<h3 class="h5">
{% if include.badges %}
<span class="mr-2">{{include.title}}</span>
{% assign badges = include.badges | replace:", ", "," | 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 = '<i class="far fa-question-circle"></i>' %}
<span class="badge badge-{{color}}" {% if tooltip %} data-toggle="tooltip" title="{{ tooltip }}">{{text}} {{ help_icon
}}
{% else %}
>{{text}}
{% endif %}
</span>
{% endfor %}
{% else %}
{{include.title}}
{% endif %}
</h3>
</div>
<div class="card-body">
<p class="card-text">
<img src="{{include.image}}" height="120" width="120" class="panel-pic" alt="{{include.title}}">
{{include.description}}
{% if include.labels %}
{% assign labels = include.labels | replace:", ", "," | 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 = '<i class="far fa-question-circle"></i>' %}
<span class="badge badge-{{color}}" {% if tooltip %} data-toggle="tooltip" title="{{ tooltip }}">{{text}} {{ help_icon
}}
{% else %}
>{{text}}
{% endif %}
</span>
{% endfor %}
{% endif %}
</p>
<div class="d-flex justify-content-between flex-column flex-md-row align-items-start align-items-md-center">
<div class="flex-shrink-0 mr-2">
@ -19,22 +55,22 @@
</div>
<div class="mt-2">
{% if include.windows %}<i class="fab fa-windows fa-2x fa-fw d-inline pr-1"></i>{% endif %}
{% if include.mac %}<i class="fab fa-apple fa-2x fa-fw d-inline pr-1"></i>{% endif %}
{% if include.linux %}<i class="fab fa-linux fa-2x fa-fw d-inline pr-1"></i>{% endif %}
{% if include.bsd %}<i class="fab fa-freebsd fa-2x fa-fw d-inline pr-1"></i>{% endif %}
{% if include.windows %}{% if include.windows != "" %}<a href="{{ include.windows }}"><i class="fab fa-windows fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-windows fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
{% if include.mac %}{% if include.mac != "" %}<a href="{{ include.mac }}"><i class="fab fa-apple fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-apple fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
{% if include.linux %}{% if include.linux != "" %}<a href="{{ include.linux }}"><i class="fab fa-linux fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-linux fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
{% if include.bsd %}{% if include.bsd != "" %}<a href="{{ include.bsd }}"><i class="fab fa-freebsd fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-freebsd fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
{% if include.firefox %}<i class="fab fa-firefox fa-2x fa-fw d-inline pr-1"></i>{% endif %}
{% if include.chrome %}<i class="fab fa-chrome fa-2x fa-fw d-inline pr-1"></i>{% endif %}
{% if include.safari %}<i class="fab fa-safari fa-2x fa-fw d-inline pr-1"></i>{% endif %}
{% if include.opera %}<i class="fab fa-opera fa-2x fa-fw d-inline pr-1"></i>{% endif %}
{% if include.edge %}<i class="fab fa-edge fa-2x fa-fw d-inline pr-1"></i>{% endif %}
{% if include.firefox %}{% if include.firefox != "" %}<a href="{{ include.firefox }}"><i class="fab fa-firefox fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-firefox fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
{% if include.chrome %}{% if include.chrome != "" %}<a href="{{ include.chrome }}"><i class="fab fa-chrome fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-chrome fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
{% if include.safari %}{% if include.safari != "" %}<a href="{{ include.safari }}"><i class="fab fa-safari fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-safari fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
{% if include.opera %}{% if include.opera != "" %}<a href="{{ include.opera }}"><i class="fab fa-opera fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-opera fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
{% if include.edge %}{% if include.edge != "" %}<a href="{{ include.edge }}"><i class="fab fa-edge fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-edge fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
{% if include.android %}<i class="fab fa-android fa-2x fa-fw d-inline pr-1"></i>{% endif %}
{% if include.ios %}<i class="fab fa-app-store-ios fa-2x fa-fw d-inline pr-1"></i>{% endif %}
{% if include.fire %}<i class="fas fa-fire fa-2x fa-fw d-inline pr-1"></i>{% endif %}
{% if include.android %}{% if include.android != "" %}<a href="{{ include.android }}"><i class="fab fa-android fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-android fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
{% if include.ios %}{% if include.ios != "" %}<a href="{{ include.ios }}"><i class="fab fa-app-store-ios fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fab fa-app-store-ios fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
{% if include.fire %}{% if include.fire != "" %}<a href="{{ include.fire }}"><i class="fas fa-fire fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fas fa-fire fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
{% if include.web %}<i class="fas fa-desktop fa-2x fa-fw d-inline pr-1"></i>{% endif %}
{% if include.web %}{% if include.web != "" %}<a href="{{ include.web }}"><i class="fas fa-desktop fa-2x fa-fw d-inline pr-1"></i></a>{% else %}<i class="fas fa-desktop fa-2x fa-fw d-inline pr-1"></i>{% endif %}{% endif %}
{{include.icon1}}
{{include.icon2}}

View File

@ -31,11 +31,11 @@
Browser
</a>
<div class="dropdown-menu" aria-labelledby="browserDropdown">
<a class="dropdown-item" href="/browsers/#fingerprint"><i class="fas fa-fingerprint fa-fw"></i> Fingerprint</a>
<a class="dropdown-item" href="/browsers/#addons"><i class="far fa-list-alt fa-fw"></i> Firefox Privacy Add-ons</a>
<a class="dropdown-item" href="/browsers/#about_config"><i class="fas fa-wrench fa-fw"></i> Privacy Related Tweaks</a>
<a class="dropdown-item" href="/browsers/#browser"><i class="fas fa-check fa-fw"></i> Recommendation</a>
<a class="dropdown-item" href="/browsers/#webrtc"><i class="far fa-eye fa-fw"></i> WebRTC IP Leak</a>
<a class="dropdown-item" href="/browsers/#browser"><i class="fas fa-check fa-fw"></i> Recommendations</a>
<a class="dropdown-item" href="/browsers/#fingerprint"><i class="fas fa-fingerprint fa-fw"></i> Fingerprinting Info</a>
<a class="dropdown-item" href="/browsers/#webrtc"><i class="far fa-eye fa-fw"></i> WebRTC IP Leak Test</a>
<a class="dropdown-item" href="/browsers/#addons"><i class="far fa-list-alt fa-fw"></i> Browser Add-ons</a>
<a class="dropdown-item" href="/browsers/#about_config"><i class="fas fa-wrench fa-fw"></i> Firefox Tweaks</a>
</div>
</li>
<li class="nav-item dropdown">
@ -49,13 +49,12 @@
<a class="dropdown-item" href="/software/email/"><i class="fas fa-envelope fa-fw"></i> Email Clients</a>
<a class="dropdown-item" href="/software/encryption-tools/"><i class="fas fa-lock fa-fw"></i> File Encryption</a>
<a class="dropdown-item" href="/software/file-sharing/"><i class="fas fa-file-export fa-fw"></i> File Sharing</a>
<a class="dropdown-item" href="/software/im/"><i class="fab fa-telegram-plane fa-fw"></i> Instant Messenger</a>
<a class="dropdown-item" href="/software/passwords/"><i class="fas fa-user-lock fa-fw"></i> Password Manager</a>
<a class="dropdown-item" href="/software/productivity/"><i class="fas fa-briefcase fa-fw"></i> Productivity Tools</a>
<a class="dropdown-item" href="/software/real-time-communication/"><i class="fas fa-comments fa-fw"></i> Real-Time Communication</a>
<a class="dropdown-item" href="/software/file-sync/"><i class="fas fa-copy fa-fw"></i> Secure File Sync</a>
<a class="dropdown-item" href="/software/networks/"><i class="fas fa-user-secret fa-fw"></i> Self-contained Networks</a>
<a class="dropdown-item" href="/software/cloud/"><i class="fas fa-hdd fa-fw"></i> Self-Hosted Cloud Server</a>
<a class="dropdown-item" href="/software/voip/"><i class="fas fa-phone fa-fw"></i> Video & Voice Messenger</a>
</div>
</li>
<li class="nav-item dropdown">
@ -63,12 +62,12 @@
OS
</a>
<div class="dropdown-menu" aria-labelledby="osDropdown">
<a class="dropdown-item" href="/operating-systems/#os"><i class="fas fa-th-large fa-fw"></i> PC OS Recommendations</a>
<a class="dropdown-item" href="/operating-systems/#live_os"><i class="fas fa-compact-disc fa-fw"></i> Live CD Operating Systems</a>
<a class="dropdown-item" href="/operating-systems/#mobile_os"><i class="fas fa-mobile-alt fa-fw"></i> Mobile Operating Systems</a>
<a class="dropdown-item" href="/operating-systems/#aaddons"><i class="fas fa-th fa-fw"></i> Android Privacy Add-ons</a>
<a class="dropdown-item" href="/operating-systems/#win10"><i class="far fa-thumbs-down fa-fw"></i> Don't use Windows 10</a>
<a class="dropdown-item" href="/operating-systems/#live_os"><i class="fas fa-compact-disc fa-fw"></i> Live CD OS</a>
<a class="dropdown-item" href="/operating-systems/#mobile_os"><i class="fas fa-mobile-alt fa-fw"></i> Mobile OS</a>
<a class="dropdown-item" href="/operating-systems/#os"><i class="fas fa-th-large fa-fw"></i> PC OS</a>
<a class="dropdown-item" href="/operating-systems/#firmware"><i class="fas fa-signal fa-fw"></i> Router Firmware</a>
<a class="dropdown-item" href="/operating-systems/#win10"><i class="far fa-thumbs-down fa-fw"></i> Don't use Windows 10</a>
</div>
</li>
<li class="nav-item">

View File

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

View File

@ -1,7 +1,7 @@
<h1 id="addons" class="anchor"><a href="#addons"><i class="fas fa-link anchor-icon"></i></a> Excellent Firefox Privacy Add-ons</h1>
<h1 id="addons" class="anchor"><a href="#addons"><i class="fas fa-link anchor-icon"></i></a> Recommended Browser Add-ons</h1>
<div class="alert alert-primary" role="alert">
<strong>Improve your privacy with these excellent Firefox add-ons.</strong>
<strong>Improve your privacy with these browser add-ons.</strong>
</div>

View File

@ -1,4 +1,4 @@
<h1 id="browser" class="anchor"><a href="#browser"><i class="fas fa-link anchor-icon"></i></a> Browser Recommendation</h1>
<h1 id="browser" class="anchor"><a href="#browser"><i class="fas fa-link anchor-icon"></i></a> Browser Recommendations</h1>
{% include cardv2.html
title="Mozilla Firefox"
@ -17,7 +17,7 @@ bsd=""
%}
{% include cardv2.html
title="Tor Browser - for anonymity"
title="Tor Browser - Provides Anonymity"
image="/assets/img/tools/Tor-Browser.png"
description='Tor Browser is your choice if you need an extra layer of anonymity. It\'s a modified version of Firefox ESR, which comes with pre-installed privacy add-ons, encryption and an advanced proxy. <a href="https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-1-myth-busting-tor">How does Tor work?</a>'
website="https://www.torproject.org/"
@ -32,7 +32,7 @@ bsd=""
%}
{% include cardv2.html
title="Brave Browser - Complete but Experimental"
title="Brave Browser - Chromium Based"
image="/assets/img/tools/Brave.png"
description="The new open source browser Brave automatically blocks ads and trackers, making it faster and safer than your current browser. Brave is based on Chromium. <span class=\"badge badge-warning\" data-toggle=\"tooltip\" title=\"Brave is a good choice if you want to use a Chromium-based browser. But at this point in Brave's development&comma; it's not as good as Firefox with privacy addons.\">experimental <i class=\"far fa-question-circle\"></i></span>"
website="https://brave.com/"

View File

@ -40,10 +40,6 @@
<a href="https://fruux.com/">fruux</a> - a unified contacts/calendaring system that works across platforms and devices.
</li>
<li>
<a href="https://signal.org/blog/flock/">Flock</a> - a discontinued calendar and contacts sync service by Open Whisper Systems. Despite being shut down the <a href="https://github.com/signalapp/Flock">source code</a> is still available on GitHub.
</li>
<li>
<a href="../cloud">cloud backups</a> - 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 <a href="../encryption-tools/#encrypt">encrypting</a> them).
</li>

View File

@ -1,37 +1,38 @@
<h1 id="live_os" class="anchor"><a href="#live_os"><i class="fas fa-link anchor-icon"></i></a> Live CD Operating Systems</h1>
<div class="row mb-2">
{% 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"
%}
{% 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."
%}
</div>
{% 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/"
%}
<h3>Worth Mentioning</h3>
<ul>
<li><a href="https://distro.ibiblio.org/tinycorelinux/">Tiny Core Linux</a> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A minimal Linux operating system focusing on providing a base system using BusyBox and FLTK. The distribution is notable for its size (15 MB) and minimalism, with additional functionality
<li><a href="https://distro.ibiblio.org/tinycorelinux/">Tiny Core Linux</a> <span class="badge badge-info">GNU/Linux</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A minimal Linux operating system focusing on providing a base system using BusyBox and FLTK. The distribution is notable for its size (15 MB) and minimalism, with additional functionality
provided by extensions.</li>
</ul>

View File

@ -4,38 +4,40 @@
<strong>Even though the source code of the following OS is provided, installing Google Apps may compromise your setup.</strong>
</div>
<div class="row mb-2">
{% 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 <a href=https://devices.ubuntu-touch.io/>supported.</a>"
%}
{% 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."
%}
</div>
{% 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 <a href=https://devices.ubuntu-touch.io/>supported.</a>"
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"
%}
<h3>Worth Mentioning</h3>
<ul>
<li><a href="https://www.replicant.us/">Replicant</a> - An open-source operating system based on Android, aiming to replace all proprietary components with free software.</li>
<li><a href="https://www.omnirom.org/">OmniROM</a> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A free software operating system for smartphones and tablet computers, based on the Android mobile platform.</li>
<li><a href="https://microg.org/">MicroG</a> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A project that aims to reimplement the proprietary Google Play Services in the Android operating system with a FLOSS replacement.
<li><a href="https://www.replicant.us/">Replicant</a> <span class="badge badge-info">AOSP</span> - An open-source operating system based on Android, aiming to replace all proprietary components with free software.</li>
<li><a href="https://www.omnirom.org/">OmniROM</a> <span class="badge badge-info">AOSP</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A free software operating system for smartphones and tablet computers, based on the Android mobile platform.</li>
<li><a href="https://microg.org/">MicroG</a> <span class="badge badge-info">Add-on Package</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A project that aims to reimplement the proprietary Google Play Services in the Android operating system with a FLOSS replacement.
</ul>

View File

@ -4,33 +4,46 @@
<strong>If you are currently using an application like Evernote, Google Keep or Microsoft OneNote you should pick an alternative here.</strong>
</div>
<div class="row mb-2">
{% include cardv2.html
title="Joplin"
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=""
%}
{% include card.html color="success"
title="Joplin"
image="/assets/img/tools/Joplin.png"
url="https://joplinapp.org/"
footer="OS: Windows, macOS, Linux, iOS, Android, Firefox/Chrome (Web Clipper)."
description="Joplin is a free, open source, fully featured note taking and to-do application, which can handle a large number of markdown notes organized into notebooks and tags. It offers E2E encryption and can sync through Nextcloud, Dropbox and more. It also offers easy import from Evernote and plain text notes."
%}
{% include cardv2.html
title="Standard Notes"
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=""
%}
{% include card.html color="primary"
title="Standard Notes"
image="/assets/img/tools/StandardNotes.png"
url="https://standardnotes.org/"
footer="OS: Windows, macOS, Linux, iOS, Android, Web."
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."
%}
{% include card.html color="warning"
title="Turtl"
image="/assets/img/tools/Turtl.png"
url="https://turtlapp.com/"
footer="OS: Windows, macOS, Linux, Android."
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."
%}
</div>
{% include cardv2.html
title="Turtl"
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=""
%}
<h3>Warning</h3>

View File

@ -1,36 +1,38 @@
<h1 id="os" class="anchor"><a href="#os"><i class="fas fa-link anchor-icon"></i></a> PC Operating Systems</h1>
<div class="alert alert-warning" role="alert">
<strong>If you are currently using a operating system like Microsoft Windows or Apple macOS, you should pick an alternative here.</strong>
<strong>If you are currently using a operating system like Windows 10, you should pick an alternative here.</strong>
</div>
<div class="row mb-2">
{% 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://qubesos4rrrrz6n4.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="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/"
git="https://salsa.debian.org/qa/debsources"
tor="http://sejnfjrq6szgca7v.onion"
%}
{% 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."
%}
</div>
{% include cardv2.html
title="Trisquel"
image="/assets/img/tools/Trisquel.png"
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.'
badges="info:GNU/Linux"
website="https://trisquel.info/"
git="https://devel.trisquel.info/groups/trisquel"
%}
<h3>Warning</h3>
@ -41,9 +43,9 @@
<h3>Worth Mentioning</h3>
<ul>
<li><a href="https://www.openbsd.org/">OpenBSD</a> - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.</li>
<li><a href="https://www.archlinux.org/">Arch Linux</a> - A simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement. <a href="https://www.parabola.nu/">Parabola</a> is a
<li><a href="https://www.openbsd.org/">OpenBSD</a> <span class="badge badge-info">BSD</span> - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.</li>
<li><a href="https://www.archlinux.org/">Arch Linux</a> <span class="badge badge-info">GNU/Linux</span> - A simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement. <a href="https://www.parabola.nu/">Parabola</a> is a
completely open source version of Arch Linux.</li>
<li><a href="https://www.whonix.org/">Whonix</a> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A Debian GNU/Linux based security-focused Linux distribution. It aims to provide privacy, security and anonymity on the internet. The operating system consists of two virtual machines, a "Workstation"
<li><a href="https://www.whonix.org/">Whonix</a> <span class="badge badge-info">GNU/Linux</span> - A Debian-based security-focused Linux distribution. It aims to provide privacy, security and anonymity on the internet. The operating system consists of two virtual machines, a "Workstation"
and a Tor "Gateway". All communication are forced through the Tor network to accomplish this.</li>
</ul>

View File

@ -1,35 +1,38 @@
<h1 id="firmware" class="anchor"><a href="#firmware"><i class="fas fa-link anchor-icon"></i></a> Open Source Router Firmware</h1>
<div class="row mb-2">
{% 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/"
github="https://github.com/openwrt"
%}
{% 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).."
%}
</div>
{% 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"
%}
<h3>Worth Mentioning</h3>
<ul>
<li><a href="https://www.openbsd.org/">OpenBSD</a> - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.</li>
<li><a href="https://dd-wrt.com/">DD-WRT</a> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A is Linux-based firmware for wireless routers and wireless access points. It is compatible with several models of routers and access points.</li>
<li><a href="https://www.openbsd.org/">OpenBSD</a> <span class="badge badge-info">BSD</span> - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.</li>
<li><a href="https://dd-wrt.com/">DD-WRT</a> <span class="badge badge-info">Linux</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A is Linux-based firmware for wireless routers and wireless access points. It is compatible with several models of routers and access points.</li>
</ul>

View File

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

View File

@ -20,96 +20,6 @@
</tr>
</thead>
<tbody>
<tr>
<td data-value="AirVPN">
<a href="https://airvpn.org/"><img alt="AirVPN" src="/assets/img/provider/AirVPN.png" width="200" height="70"></a></td>
<td>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://airvpn.org/" href="https://airvpn.org/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
</td>
<td data-value="2010">2010</td>
<td data-value="{{ 54 | times: eur_to_usd }}">54 €</td>
<td><span class="label label-success">Yes</span></td>
<td>162</td>
<td><span class="label label-warning">No</span></td>
<td><span class="flag-icon flag-icon-it"></span> Italy</td>
</tr>
<tr>
<td data-value="AzireVPN">
<a href="https://www.azirevpn.com/"><img alt="AzireVPN" src="/assets/img/provider/AzireVPN.png" width="200" height="70"></a>
</td>
<td>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.azirevpn.com/" href="https://www.azirevpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
</td>
<td data-value="2012">2012</td>
<td data-value="{{ 45 | times: eur_to_usd }}">45 €</td>
<td><span class="label label-success">Yes</span></td>
<td>22</td>
<td><span class="label label-success">Yes</span></td>
<td><span class="flag-icon flag-icon-se"></span> Sweden</td>
</tr>
<tr>
<td data-value="blackVPN">
<a href="https://www.blackvpn.com/"><img alt="blackVPN" src="/assets/img/provider/blackVPN.png" width="200" height="70"></a>
</td>
<td>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.blackvpn.com/" href="https://www.blackvpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
</td>
<td data-value="2009">2009</td>
<td data-value="{{ 49 | times: eur_to_usd }}">49 €</td>
<td><span class="label label-success">Yes</span></td>
<td>31</td>
<td><span class="label label-warning">No</span></td>
<td><span class="flag-icon flag-icon-hk"></span> Hong Kong</td>
</tr>
<tr>
<td data-value="ExpressVPN">
<a href="https://www.expressvpn.com/"><img alt="ExpressVPN" src="/assets/img/provider/ExpressVPN.png" width="200" height="70"></a>
</td>
<td>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.expressvpn.com/" href="https://www.expressvpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="http://expressobutiolem.onion. Requires specific software to access: torproject.org" href="http://expressobutiolem.onion/"><img alt="Tor" src="/assets/img/layout/tor.png" width="35"></a>
</td>
<td data-value="2009">2009</td>
<td data-value="100">$ 99.95</td> <!-- USD on December 28, 2018 -->
<td><span class="label label-success">Yes</span></td>
<td>148</td>
<td><span class="label label-warning">No</span></td>
<td><span class="flag-icon flag-icon-vg"></span> British Virgin Islands</td>
</tr>
<tr>
<td data-value="FrootVPN">
<a href="https://www.frootvpn.com/"><img alt="FrootVPN" src="/assets/img/provider/FrootVPN.png" width="200" height="70"></a>
</td>
<td>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.frootvpn.com/" href="https://www.frootvpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
</td>
<td data-value="2014">2014</td>
<td data-value="36">$ 35.88</td>
<td><span class="label label-warning">No</span></td>
<td>27</td>
<td><span class="label label-warning">No</span></td>
<td><span class="flag-icon flag-icon-se"></span> Sweden</td>
</tr>
<tr>
<td data-value="hide.me">
<a href="https://hide.me/"><img alt="hide.me" src="/assets/img/provider/hide.me.png" width="200" height="70"></a>
</td>
<td>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://hide.me/" href="https://hide.me/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
</td>
<td data-value="2012">2012</td>
<td data-value="0"><a data-toggle="tooltip" data-placement="bottom" data-original-title="2 GB data transfer, 1 simultaneous connection" href="https://hide.me/pricing">Free</a></td>
<td><span class="label label-success">Yes</span></td>
<td>160+</td>
<td><span class="label label-warning">No</span></td>
<td><span class="flag-icon flag-icon-my"></span> Malaysia</td>
</tr>
<tr>
<td data-value="IVPN">
<a href="https://www.ivpn.net/"><img alt="IVPN" src="/assets/img/provider/IVPN.png" width="200" height="70"></a>
@ -156,36 +66,6 @@
<td><span class="flag-icon flag-icon-pa"></span> Panama</td>
</tr>
<tr>
<td data-value="OVPN">
<a href="https://www.ovpn.com/"><img alt="OVPN" src="/assets/img/provider/ovpn.png" width="200" height="70"></a>
</td>
<td>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.ovpn.com/" href="https://www.ovpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
</td>
<td data-value="2014">2014</td>
<td data-value="{{ 84 | times: eur_to_usd }}">84 €</td>
<td><span class="label label-success">Yes</span></td>
<td>67</td>
<td><span class="label label-warning">No</span></td>
<td><span class="flag-icon flag-icon-se"></span> Sweden</td>
</tr>
<tr>
<td data-value="Perfect Privacy">
<a href="https://www.perfect-privacy.com/"><img alt="Perfect Privacy" src="/assets/img/provider/Perfect-Privacy.png" width="200" height="70"></a>
</td>
<td>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.perfect-privacy.com/" href="https://www.perfect-privacy.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
</td>
<td data-value="2008">2008</td>
<td data-value="{{ 119.99 | times: eur_to_usd }}">119.99 €</td>
<td><span class="label label-warning">No</span></td>
<td>54</td>
<td><span class="label label-warning">No</span></td>
<td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
</tr>
<tr>
<td data-value="ProtonVPN">
<a href="https://protonvpn.com/"><img alt="ProtonVPN" src="/assets/img/provider/ProtonVPN.png" width="200" height="70"></a >
@ -200,79 +80,6 @@
<td><span class="label label-warning">No</span></td>
<td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
</tr>
<tr>
<td data-value="Proxy.sh">
<a href="https://proxy.sh/"><img alt="Proxy.sh" src="/assets/img/provider/Proxy.sh.png" width="200" height="70"></a>
</td>
<td>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://proxy.sh/" href="https://proxy.sh/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
</td>
<td data-value="2012">2012</td>
<td data-value="40">$ 40</td>
<td><span class="label label-warning">No</span></td>
<td>300+</td>
<td><span class="label label-warning">No</span></td>
<td><span class="flag-icon flag-icon-sc"></span> Seychelles</td>
</tr>
<tr>
<td data-value="Trust.Zone">
<a href="https://trust.zone/"><img alt="Trust.Zone" src="/assets/img/provider/Trust.Zone.png" width="200" height="70"></a>
</td>
<td>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://trust.zone/" href="https://trust.zone/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
</td>
<td data-value="2014">2014</td>
<td data-value="40">$ 39.95</td>
<td><span class="label label-success">Yes</span></td>
<td>164</td>
<td><span class="label label-warning">No</span></td>
<td><span class="flag-icon flag-icon-sc"></span> Seychelles</td>
</tr>
<tr>
<td data-value="VPN.ht">
<a href="https://vpn.ht/"><img alt="VPN.ht" src="/assets/img/provider/VPN.ht.png" width="200" height="70"></a>
</td>
<td>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://vpn.ht/" href="https://vpn.ht/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
</td>
<td data-value="2014">2014</td>
<td data-value="40">$ 39.99</td>
<td><span class="label label-warning">No</span></td>
<td>128</td>
<td><span class="label label-warning">No</span></td>
<td><span class="flag-icon flag-icon-hk"></span> Hong Kong</td>
</tr>
<tr>
<td data-value="VPNArea">
<a href="https://vpnarea.com/"><img alt="VPNArea" src="/assets/img/provider/vpnarea.png" width="200" height="70"></a>
</td>
<td>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://vpnarea.com/" href="https://vpnarea.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
</td>
<td data-value="2014">2014</td>
<td data-value="59">$ 59</td>
<td><span class="label label-success">Yes</span></td>
<td>204</td>
<td><span class="label label-warning">No</span></td>
<td><span class="flag-icon flag-icon-bg"></span> Bulgaria</td>
</tr>
<tr>
<td data-value="VPNTunnel">
<a href="https://vpntunnel.com/"><img alt="VPNTunnel" src="/assets/img/provider/VPNTunnel.png" width="200" height="70"></a>
</td>
<td>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://vpntunnel.com/" href="https://vpntunnel.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
</td>
<td data-value="2014">2014</td>
<td data-value="{{ 35.88 | times: eur_to_usd }}">35.88 €</td>
<td><span class="label label-warning">No</span></td>
<td>800+</td>
<td><span class="label label-warning">No</span></td>
<td><span class="flag-icon flag-icon-sc"></span> Seychelles</td>
</tr>
</tbody>
</table>
</div>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

2
nginx/000-includes.conf Normal file
View File

@ -0,0 +1,2 @@
include /var/www/privacytools.io/nginx/010-headers.conf;
include /var/www/privacytools.io/nginx/020-redirects.conf;

9
nginx/010-headers.conf Normal file
View File

@ -0,0 +1,9 @@
add_header X-Frame-Options DENY always;
add_header X-XSS-Protection "1; mode=block" always;
add_header X-Content-Type-Options nosniff always;
add_header Content-Security-Policy "default-src 'none'; script-src 'self' 'unsafe-inline' https://stats.privacytools.io; style-src 'self' 'unsafe-inline'; img-src 'self' data: https://*.privacytools.io; object-src 'none'; frame-src https://stats.privacytools.io; font-src 'self'; manifest-src 'self';" always;
add_header Strict-Transport-Security "max-age=31557600; includeSubDomains; preload";
add_header 'Access-Control-Allow-Origin' '*';
add_header Alt-Svc 'h2="privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd.onion:443"; ma=86400; persist=1';
add_header Expect-CT 'max-age=0; report-uri="https://34f7a2cb34f91bc092b2e15f4e4bda78.report-uri.com/r/d/ct/reportOnly"';
add_header Referrer-Policy "strict-origin";

12
nginx/020-redirects.conf Normal file
View File

@ -0,0 +1,12 @@
location = /old/ {
return 301 /classic/;
}
location = /software/im/ {
return 301 /software/real-time-communication/;
}
location = /software/voip/ {
return 301 /software/real-time-communication/;
}
location = /software/teamchat/ {
return 301 /software/real-time-communication/;
}

View File

@ -1,8 +0,0 @@
---
layout: page
permalink: /software/im/
title: "Instant Messaging"
description: "Discover secure and private ways to message others online without letting any third parties read your messages."
---
{% include sections/instant-messenger.html %}

View File

@ -0,0 +1,16 @@
---
layout: page
permalink: /software/real-time-communication/
title: "Real-Time Communication"
description: "Discover secure and private ways to communicate with others online without letting any third parties read your messages."
---
{% include sections/instant-messenger.html %}
<hr/>
{% include sections/voice-video-messenger.html %}
<hr/>
{% include sections/teamchat.html %}

View File

@ -1,8 +0,0 @@
---
layout: page
permalink: /software/voip/
title: "VoIP"
description: "Find a voice and video messenger that supports completely End-to-End encrypted calls."
---
{% include sections/voice-video-messenger.html %}

View File

@ -134,6 +134,12 @@ Backend: closed-source
Status.im: https://github.com/status-im
## Team chat
Rocket.chat: https://github.com/rocketchat/
Keybase: https://github.com/Keybase
## Encrypted Video & Voice Messenger
Signal: https://github.com/signalapp
@ -420,9 +426,8 @@ Backend: Closed Source
MicroG: https://github.com/microg
## Android Privacy Add-ons
NetGuard: https://github.com/M66B/NetGuard/
XPrivacyLua: https://github.com/M66B/XPrivacyLua/
NetGuard: https://github.com/M66B/NetGuard/
## Open Source Router Firmware
OpenWRT: https://git.openwrt.org/?p=openwrt/openwrt.git;a=shortlog;h=refs/tags/v18.06.1