From 512b6edf243b423c8e090165510f9a6c752a484b Mon Sep 17 00:00:00 2001 From: "J. C" <73438877+1hiking@users.noreply.github.com> Date: Thu, 29 Apr 2021 11:12:20 -0500 Subject: [PATCH 1/6] Replace strong tags to b and em tags to i --- 404.html | 2 +- README.md | 2 +- _includes/footer.html | 6 +- _includes/sections/android-addons.html | 4 +- .../sections/android-operating-systems.html | 2 +- _includes/sections/browser-addons.html | 26 +++---- _includes/sections/browser-fingerprint.html | 2 +- _includes/sections/browser-tweaks.html | 2 +- _includes/sections/browser-webrtc.html | 2 +- .../sections/calendar-contacts-sync.html | 6 +- _includes/sections/cloud-storage.html | 4 +- _includes/sections/decentralized-video.html | 2 +- _includes/sections/dns.html | 8 +- _includes/sections/email-providers.html | 16 ++-- _includes/sections/email-warning.html | 2 +- _includes/sections/file-encryption.html | 8 +- _includes/sections/file-sync.html | 2 +- _includes/sections/instant-messenger.html | 4 +- _includes/sections/ios-addons.html | 4 +- _includes/sections/key-disclosure-law.html | 2 +- _includes/sections/notebooks.html | 2 +- _includes/sections/operating-systems.html | 4 +- _includes/sections/participate.html | 2 +- _includes/sections/password-managers.html | 8 +- _includes/sections/privacy-resources.html | 44 +++++------ _includes/sections/productivity-tools.html | 10 +-- _includes/sections/quotes.html | 2 +- _includes/sections/search-engines.html | 2 +- .../sections/self-contained-networks.html | 4 +- _includes/sections/selfhosted-cloud.html | 4 +- _includes/sections/social-networks.html | 2 +- .../sections/social-news-aggregator.html | 2 +- _includes/sections/teamchat.html | 2 +- _includes/sections/tor-operating-systems.html | 2 +- _includes/sections/video-frontends.html | 2 +- _includes/sections/voice-video-messenger.html | 2 +- _includes/sections/vpn.html | 14 ++-- _includes/sections/windows10.html | 12 +-- _includes/sponsors/silver.html | 8 +- pages/about/about.html | 6 +- pages/donate.html | 74 +++++++++---------- pages/providers/email.html | 34 ++++----- pages/providers/vpn.html | 56 +++++++------- pages/services/chat.html | 12 +-- pages/services/services.html | 6 +- pages/sponsors.html | 14 ++-- 46 files changed, 218 insertions(+), 218 deletions(-) diff --git a/404.html b/404.html index 6e8e7276..ce0722e9 100644 --- a/404.html +++ b/404.html @@ -5,7 +5,7 @@ active_page: 404

404

-

We couldn't find that :(

+

We couldn't find that :(

Maybe you were looking for one of these pages?

diff --git a/README.md b/README.md index cacbb5bf..78faf259 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ PrivacyTools

- Encryption Against Global Mass Surveillance. + Encryption Against Global Mass Surveillance.

diff --git a/_includes/footer.html b/_includes/footer.html index 38ea9d03..ae0a8aa9 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -79,11 +79,11 @@ JavaScript Licenses

- No Ads, No Google Analytics, No Affiliates, No Cross-Site Requests. - {{ site.name }} is a socially motivated website that provides information for protecting your data security and privacy. Never trust any company with your privacy, always encrypt. + No Ads, No Google Analytics, No Affiliates, No Cross-Site Requests. + {{ site.name }} is a socially motivated website that provides information for protecting your data security and privacy. Never trust any company with your privacy, always encrypt.

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

diff --git a/_includes/sections/android-addons.html b/_includes/sections/android-addons.html index 9220156f..a2762d39 100644 --- a/_includes/sections/android-addons.html +++ b/_includes/sections/android-addons.html @@ -8,7 +8,7 @@

Control your traffic with NetGuard

-

NetGuard provides simple and advanced methods to block certain apps from accessing the internet, without requiring root privileges. Applications and addresses can be individually allowed or denied access to your Wi-Fi and/or mobile connections, allowing you to control exactly which apps are able to phone home or not.

+

NetGuard provides simple and advanced methods to block certain apps from accessing the internet, without requiring root privileges. Applications and addresses can be individually allowed or denied access to your Wi-Fi and/or mobile connections, allowing you to control exactly which apps are able to phone home or not.

@@ -18,7 +18,7 @@

Tor for Android with Orbot

-

Orbot is a free proxy app that empowers other apps to use the internet more securely. Orbot uses Tor to encrypt your Internet traffic and then hides it by bouncing through a series of computers around the world.

+

Orbot is a free proxy app that empowers other apps to use the internet more securely. Orbot uses Tor to encrypt your Internet traffic and then hides it by bouncing through a series of computers around the world.

diff --git a/_includes/sections/android-operating-systems.html b/_includes/sections/android-operating-systems.html index 6825a1bf..8c5d6c26 100644 --- a/_includes/sections/android-operating-systems.html +++ b/_includes/sections/android-operating-systems.html @@ -3,7 +3,7 @@

Android-based Operating Systems

{% include cardv2.html diff --git a/_includes/sections/browser-addons.html b/_includes/sections/browser-addons.html index beebabc2..551d7c23 100644 --- a/_includes/sections/browser-addons.html +++ b/_includes/sections/browser-addons.html @@ -7,7 +7,7 @@ {% include cardv2.html title="uBlock Origin: Block Ads and Trackers" image="/assets/img/svg/3rd-party/ublock_origin.svg" - description="

uBlock Origin is an efficient wide-spectrum blocker that is easy on memory, and yet can load and enforce thousands more filters than other popular blockers out there. It has no monetization strategy and is completely open source. Advanced mode allows for dynamic filtering. Dynamic filtering allows for extended blocking similar to NoScript and uMatrix (E.g. medium or hard) blocking.

" + description="

uBlock Origin is an efficient wide-spectrum blocker that is easy on memory, and yet can load and enforce thousands more filters than other popular blockers out there. It has no monetization strategy and is completely open source. Advanced mode allows for dynamic filtering. Dynamic filtering allows for extended blocking similar to NoScript and uMatrix (E.g. medium or hard) blocking.

" website="https://addons.mozilla.org/firefox/addon/ublock-origin/" privacy-policy="https://github.com/gorhill/uBlock/wiki/Privacy-policy" forum="https://forum.privacytools.io/t/discussion-ublock-origin/266" @@ -21,7 +21,7 @@ {% include cardv2.html title="HTTPS Everywhere: Secure Connections" image="/assets/img/svg/3rd-party/https_everywhere.svg" - description="HTTPS Everywhere enables encryption of your connections to many major websites, making your browsing more secure. It is a collaboration between The Tor Project and the Electronic Frontier Foundation." + description="HTTPS Everywhere enables encryption of your connections to many major websites, making your browsing more secure. It is a collaboration between The Tor Project and the Electronic Frontier Foundation." website="https://www.eff.org/https-everywhere" privacy-policy="https://www.eff.org/code/privacy/policy" forum="https://forum.privacytools.io/t/discussion-https-everywhere/268" @@ -34,7 +34,7 @@ {% include cardv2.html title="Decentraleyes: Block Content Delivery Networks" image="/assets/img/svg/3rd-party/decentraleyes.svg" - description="Decentraleyes emulates Content Delivery Networks locally by intercepting requests, finding the required resource, and injecting it into the environment. This all happens instantaneously, automatically, and no prior configuration is required." + description="Decentraleyes emulates Content Delivery Networks locally by intercepting requests, finding the required resource, and injecting it into the environment. This all happens instantaneously, automatically, and no prior configuration is required." website="https://decentraleyes.org/" privacy-policy="https://decentraleyes.org/privacy-policy/" forum="https://forum.privacytools.io/t/discussion-decentraleyes/269" @@ -47,7 +47,7 @@ {% include cardv2.html title="ClearURLs" image="/assets/img/svg/3rd-party/clearurls.svg" - description="ClearURLs will automatically remove tracking elements from URLs to help protect your privacy when browsing through the Internet." + description="ClearURLs will automatically remove tracking elements from URLs to help protect your privacy when browsing through the Internet." website="https://gitlab.com/KevinRoebert/ClearUrls" privacy-policy="https://gitlab.com/KevinRoebert/ClearUrls/-/blob/master/PRIVACY.md" forum="https://forum.privacytools.io/t/discussion-clearurls/3353" @@ -60,7 +60,7 @@ {% include cardv2.html title="xBrowserSync" image="/assets/img/svg/3rd-party/xbrowsersync.svg" - description='xBrowserSync synchronizes bookmarks across devices and browsers with end-to-end encryption. Data is encrypted and decrypted on the device, no one but you can read it. No registration is needed, just enter a randomly generated id or QR code on all devices. Different servers are available, and it can also be self-hosted.' + description='xBrowserSync synchronizes bookmarks across devices and browsers with end-to-end encryption. Data is encrypted and decrypted on the device, no one but you can read it. No registration is needed, just enter a randomly generated id or QR code on all devices. Different servers are available, and it can also be self-hosted.' website="https://www.xbrowsersync.org/" privacy-policy="https://www.xbrowsersync.org/privacypolicy" github="https://github.com/xbrowsersync" @@ -84,7 +84,7 @@ {% include cardv2.html title="Terms of Service; Didn’t Read: Be Informed" image="/assets/img/svg/3rd-party/terms_of_service_didnt_read.svg" - description='Terms of Service; Didn’t Read is an addon that believes "I have read and agree to the Terms of Service" is the biggest lie on the web, and wants to fix it by grading websites based on their terms of service agreements and privacy policies. It also gives short summaries of those agreements. The analysis and ratings are published transparently by a community of reviewers.' + description='Terms of Service; Didn’t Read is an addon that believes "I have read and agree to the Terms of Service" is the biggest lie on the web, and wants to fix it by grading websites based on their terms of service agreements and privacy policies. It also gives short summaries of those agreements. The analysis and ratings are published transparently by a community of reviewers.' website="https://tosdr.org/" privacy-policy="https://addons.mozilla.org/firefox/addon/terms-of-service-didnt-read/privacy/" forum="https://forum.privacytools.io/t/discussion-terms-of-service-didn-t-read/270" @@ -97,7 +97,7 @@ {% include cardv2.html title="Snowflake" image="/assets/img/svg/3rd-party/snowflake.svg" - description="Snowflake is a new pluggable transport from the Tor Project. If you have an uncensored connection, running this extension volunteers your connection to be used as a Snowflake proxy to help users unable to connect to the Tor network. Your IP will not be visible to the sites users visit using your proxy, as this extension will not make you an exit node. If your access to the Tor network is blocked, this extension will not assist you, and you should use the Tor Browser instead. Note: This add-on does not work with WebRTC disabled." + description="Snowflake is a new pluggable transport from the Tor Project. If you have an uncensored connection, running this extension volunteers your connection to be used as a Snowflake proxy to help users unable to connect to the Tor network. Your IP will not be visible to the sites users visit using your proxy, as this extension will not make you an exit node. If your access to the Tor network is blocked, this extension will not assist you, and you should use the Tor Browser instead. Note: This add-on does not work with WebRTC disabled." website="https://snowflake.torproject.org" forum="https://forum.privacytools.io/t/discussion-snowflake/1146" git="https://gitweb.torproject.org/pluggable-transports/snowflake.git" @@ -117,7 +117,7 @@ title="Temporary Containers" image="/assets/img/svg/3rd-party/temporary_containers.svg" image-dark="/assets/img/svg/3rd-party/temporary_containers-dark.svg" - description="Temporary Containers allow you to open tabs, websites, and links in automatically managed disposable containers. Containers isolate data websites store (cookies, storage, and more) from each other, enhancing your privacy and security while you browse: Enhance your privacy in Firefox with Temporary Containers." + description="Temporary Containers allow you to open tabs, websites, and links in automatically managed disposable containers. Containers isolate data websites store (cookies, storage, and more) from each other, enhancing your privacy and security while you browse: Enhance your privacy in Firefox with Temporary Containers." website="https://addons.mozilla.org/firefox/addon/temporary-containers/" privacy-policy="https://addons.mozilla.org/firefox/addon/temporary-containers/privacy/" forum="https://forum.privacytools.io/t/discussion-temporary-containers-multi-account-containers/3354" @@ -128,7 +128,7 @@ {% include cardv2.html title="Firefox Multi-Account Containers" image="/assets/img/svg/3rd-party/firefox_multi_account_containers.svg" - description="Firefox Multi-Account Containers allow you to create containers for specific websites. These containers are isolated from eachother. This add-on can be used in conjunctiuon with Temporary Containers to allow persistent logins to websites you specify." + description="Firefox Multi-Account Containers allow you to create containers for specific websites. These containers are isolated from eachother. This add-on can be used in conjunctiuon with Temporary Containers to allow persistent logins to websites you specify." website="https://support.mozilla.org/kb/containers" forum="https://forum.privacytools.io/t/discussion-temporary-containers-multi-account-containers/3354" github="https://github.com/mozilla/multi-account-containers" @@ -144,7 +144,7 @@ {% include cardv2.html title="ETag Stoppa" image="/assets/img/svg/3rd-party/etag_stoppa.svg" - description="ETag Stoppa Prevents Firefox from storing entity tags by removing ETag response headers unconditionally and without exceptions." + description="ETag Stoppa Prevents Firefox from storing entity tags by removing ETag response headers unconditionally and without exceptions." website="https://addons.mozilla.org/firefox/addon/etag-stoppa/" forum="" github="https://github.com/claustromaniac/etag-stoppa" @@ -154,7 +154,7 @@ {% include cardv2.html title="Cookie AutoDelete: Automatically Delete Cookies" image="/assets/img/png/3rd-party/cookie_autodelete.png" - description="Cookie AutoDelete automatically removes cookies, lingering sessions, and other information that can be used to spy on you when they are no longer used by open browser tabs." + description="Cookie AutoDelete automatically removes cookies, lingering sessions, and other information that can be used to spy on you when they are no longer used by open browser tabs." website="https://addons.mozilla.org/firefox/addon/cookie-autodelete/" forum="https://forum.privacytools.io/t/discussion-cookie-autodelete/267" github="https://github.com/Cookie-AutoDelete/Cookie-AutoDelete" @@ -171,7 +171,7 @@ {% include cardv2.html title="uMatrix: Stop Cross-Site Requests" image="/assets/img/png/3rd-party/umatrix.png" - description="uMatrix gives you control over the requests that websites make to other websites. Many websites integrate features which let other websites track you, such as Facebook Like Buttons or Google Analytics. uMatrix allows 1st party scripts in its default configuration. If you want the default functionality of NoScript consider blocking 1st party scripts everywhere by default. This addon has been discontinued." + description="uMatrix gives you control over the requests that websites make to other websites. Many websites integrate features which let other websites track you, such as Facebook Like Buttons or Google Analytics. uMatrix allows 1st party scripts in its default configuration. If you want the default functionality of NoScript consider blocking 1st party scripts everywhere by default. This addon has been discontinued." website="https://addons.mozilla.org/firefox/addon/umatrix/" privacy-policy="https://github.com/gorhill/uMatrix/wiki/Privacy-policy" forum="https://forum.privacytools.io/t/discussion-umatrix/271" @@ -184,7 +184,7 @@ {% include cardv2.html title="CanvasBlocker" image="/assets/img/svg/3rd-party/canvasblocker.svg" - description="CanvasBlocker allows users to prevent websites from using some Javascript APIs to fingerprint them. Users can choose to block the APIs entirely on some or all websites (which may break some websites) or just block or fake its fingerprinting-friendly readout API." + description="CanvasBlocker allows users to prevent websites from using some Javascript APIs to fingerprint them. Users can choose to block the APIs entirely on some or all websites (which may break some websites) or just block or fake its fingerprinting-friendly readout API." website="https://github.com/kkapsner/CanvasBlocker/" privacy-policy="https://addons.mozilla.org/firefox/addon/canvasblocker/privacy/" forum="https://forum.privacytools.io/t/discussion-canvasblocker/3352" diff --git a/_includes/sections/browser-fingerprint.html b/_includes/sections/browser-fingerprint.html index 787075cb..d4c8e18d 100644 --- a/_includes/sections/browser-fingerprint.html +++ b/_includes/sections/browser-fingerprint.html @@ -12,7 +12,7 @@

-

You need to find what most browsers are reporting, and then use those variables to bring your browser in the same population. This means having the same fonts, plugins, and extensions installed as the large installed base. You should have a spoofed user-agent string to match what the large userbase has. You need to have the same settings enabled and disabled, such as DNT and WebGL. You need your browser to look as common as everyone else. Disabling JavaScript, using Linux, or even using the Tor Browser Bundle, will make your browser stick out from the masses.

+

You need to find what most browsers are reporting, and then use those variables to bring your browser in the same population. This means having the same fonts, plugins, and extensions installed as the large installed base. You should have a spoofed user-agent string to match what the large userbase has. You need to have the same settings enabled and disabled, such as DNT and WebGL. You need your browser to look as common as everyone else. Disabling JavaScript, using Linux, or even using the Tor Browser Bundle, will make your browser stick out from the masses.

Modern web browsers have not been architected to assure personal web privacy. Rather than worrying about being fingerprinted, it seems more practical to use free software plugins to regain control. They not only respect your freedom, but your privacy also. You can get much further with these than trying to manipulate your browser's fingerprint.

diff --git a/_includes/sections/browser-tweaks.html b/_includes/sections/browser-tweaks.html index 9b69d737..bb7c2918 100644 --- a/_includes/sections/browser-tweaks.html +++ b/_includes/sections/browser-tweaks.html @@ -1,6 +1,6 @@

Firefox: Privacy Related "about:config" Tweaks

- +

Preparation:

diff --git a/_includes/sections/browser-webrtc.html b/_includes/sections/browser-webrtc.html index 3b2fc636..0a9b5274 100644 --- a/_includes/sections/browser-webrtc.html +++ b/_includes/sections/browser-webrtc.html @@ -13,7 +13,7 @@

How to disable WebRTC in Firefox?

In short: Set "media.peerconnection.enabled" to "false" in "about:config".

-

Explained:

+

Explained:

  1. Enter "about:config" in the firefox address bar and press enter.
    2. diff --git a/_includes/sections/calendar-contacts-sync.html b/_includes/sections/calendar-contacts-sync.html index 71940410..0bd0b779 100644 --- a/_includes/sections/calendar-contacts-sync.html +++ b/_includes/sections/calendar-contacts-sync.html @@ -1,14 +1,14 @@

    Calendar and Contacts Sync

    {% include cardv2.html title="Nextcloud" image="/assets/img/svg/3rd-party/nextcloud.svg" - 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/" privacy-policy="https://nextcloud.com/privacy/" forum="https://forum.privacytools.io/t/discussion-nextcloud-calender-contacts-sync-tools/1535" @@ -27,7 +27,7 @@ include cardv2.html title="EteSync" image="/assets/img/svg/3rd-party/etesync.svg" - description="EteSync is a secure, end-to-end encrypted, and privacy-respecting cloud backup and synchronization software for your personal information (e.g. contacts and calendars). There are native clients for Android, iOS, and the web, and an adapter layer for most desktop clients. It costs $24 per year to use, or you can host the server yourself for free." + description="EteSync is a secure, end-to-end encrypted, and privacy-respecting cloud backup and synchronization software for your personal information (e.g. contacts and calendars). There are native clients for Android, iOS, and the web, and an adapter layer for most desktop clients. It costs $24 per year to use, or you can host the server yourself for free." website="https://www.etesync.com/" privacy-policy="https://www.etesync.com/tos/#privacy" forum="https://forum.privacytools.io/t/discussion-etesync-calender-contacts-sync-tools/1536" diff --git a/_includes/sections/cloud-storage.html b/_includes/sections/cloud-storage.html index 3a8881a1..98e1b58e 100644 --- a/_includes/sections/cloud-storage.html +++ b/_includes/sections/cloud-storage.html @@ -1,13 +1,13 @@

    Encrypted Cloud Storage Services

    {% include cardv2.html title="Nextcloud - Choose your hoster" image="/assets/img/svg/3rd-party/nextcloud.svg" - description="Nextcloud is a suite of free and open-source client-server software for creating your own file hosting services on a private server you control. The only limits on storage and bandwidth are the limits on the server provider you choose." + description="Nextcloud is a suite of free and open-source client-server software for creating your own file hosting services on a private server you control. The only limits on storage and bandwidth are the limits on the server provider you choose." website="https://nextcloud.com/" privacy-policy="https://nextcloud.com/privacy/" forum="https://forum.privacytools.io/t/discussion-nextcloud/287" diff --git a/_includes/sections/decentralized-video.html b/_includes/sections/decentralized-video.html index 6893b395..45d4e8ab 100644 --- a/_includes/sections/decentralized-video.html +++ b/_includes/sections/decentralized-video.html @@ -1,7 +1,7 @@

    Decentralized Video Platforms

    {% include cardv2.html diff --git a/_includes/sections/dns.html b/_includes/sections/dns.html index 54046d94..cedb6812 100644 --- a/_includes/sections/dns.html +++ b/_includes/sections/dns.html @@ -632,13 +632,13 @@ We also log how many times this or that tracker has been blocked. We need this i

    - In iOS, iPadOS, tvOS 14 and macOS 11, DoT and DoH were introduced. DoT and DoH are supported natively by installation of profiles (through mobileconfig files opened in Safari). - After installation, the encrypted DNS server can be selected in Settings → General → VPN and Network → DNS. + In iOS, iPadOS, tvOS 14 and macOS 11, DoT and DoH were introduced. DoT and DoH are supported natively by installation of profiles (through mobileconfig files opened in Safari). + After installation, the encrypted DNS server can be selected in Settings → General → VPN and Network → DNS.

    diff --git a/_includes/sections/email-providers.html b/_includes/sections/email-providers.html index ae636377..a5e38afd 100644 --- a/_includes/sections/email-providers.html +++ b/_includes/sections/email-providers.html @@ -1,7 +1,7 @@

    Recommended Email Services

    @@ -17,9 +17,9 @@

    ProtonMail {% include badge.html color="info" text="Free" %}

    -

    ProtonMail.com is an email service with a focus on privacy, encryption, security, and ease of use. They have been in operation since 2013. ProtonMail is based in Genève, Switzerland. Accounts start with 500 MB storage with their free plan.

    +

    ProtonMail.com is an email service with a focus on privacy, encryption, security, and ease of use. They have been in operation since 2013. ProtonMail is based in Genève, Switzerland. Accounts start with 500 MB storage with their free plan.

    -

    Free accounts have some limitations and do not allow the use of the ProtonMail Bridge, which is required to use a recommended email client (e.g. Thunderbird) or to search email by body text. Paid accounts are available starting at €48/y which include features like ProtonMail Bridge, additional storage, custom domain support, and more. The webmail and mobile apps can only search To:, From:, Date: and Subject: (this is likely to change when v4.0 of ProtonMail is released).

    +

    Free accounts have some limitations and do not allow the use of the ProtonMail Bridge, which is required to use a recommended email client (e.g. Thunderbird) or to search email by body text. Paid accounts are available starting at €48/y which include features like ProtonMail Bridge, additional storage, custom domain support, and more. The webmail and mobile apps can only search To:, From:, Date: and Subject: (this is likely to change when v4.0 of ProtonMail is released).

    {% include badge.html color="success" text="Domains and Aliases" %}

    Paid ProtonMail users can use their own domain with the service. Catch-all addresses are supported with custom domains for Professional and Visionary plans. ProtonMail also supports subaddressing, which is useful for users who don't want to purchase a domain.

    @@ -55,7 +55,7 @@

    Mailbox.org {% include badge.html color="info" text="€12/y" %}

    -

    Mailbox.org is an email service with a focus on being secure, ad-free, and privately powered by 100% eco-friendly energy. They have been in operation since 2014. Mailbox.org is based in Berlin, Germany. Accounts start with 2 GB of storage, which can be upgraded as needed.

    +

    Mailbox.org is an email service with a focus on being secure, ad-free, and privately powered by 100% eco-friendly energy. They have been in operation since 2014. Mailbox.org is based in Berlin, Germany. Accounts start with 2 GB of storage, which can be upgraded as needed.

    {% include badge.html color="success" text="Domains and Aliases" %}

    Mailbox.org lets users use their own domain and they support catch-all addresses. Mailbox.org also supports subaddressing, which is useful for users who don't want to purchase a domain.

    @@ -92,7 +92,7 @@

    Posteo {% include badge.html color="info" text="€12/y" %}

    -

    Posteo.de is an email provider that focuses on anonymous, secure, and private email. Their servers are powered by 100% sustainable energy. They have been in operation since 2009. Posteo is based in Germany and has a free 14-day trial. Posteo comes with 2 GB for the monthly cost and an extra gigabyte can be purchased for €0.25 per month.

    +

    Posteo.de is an email provider that focuses on anonymous, secure, and private email. Their servers are powered by 100% sustainable energy. They have been in operation since 2009. Posteo is based in Germany and has a free 14-day trial. Posteo comes with 2 GB for the monthly cost and an extra gigabyte can be purchased for €0.25 per month.

    {% include badge.html color="warning" text="Domains and Aliases" %}

    Posteo does not allow the use of custom domains, however users may still make use of subaddressing.

    @@ -129,7 +129,7 @@

    Disroot {% include badge.html color="info" text="Free" %}

    -

    Disroot offers email amongst other services. The service is maintained by volunteers and its community. They have been in operation since 2015. Disroot is based in Amsterdam. Disroot is free and uses open source software such as Rainloop to provide service. Users support the service through donations and buying extra storage. The mailbox limit is 1 GB, but extra storage can be purchased 0.15€ per GB per month paid yearly.

    +

    Disroot offers email amongst other services. The service is maintained by volunteers and its community. They have been in operation since 2015. Disroot is based in Amsterdam. Disroot is free and uses open source software such as Rainloop to provide service. Users support the service through donations and buying extra storage. The mailbox limit is 1 GB, but extra storage can be purchased 0.15€ per GB per month paid yearly.

    {% include badge.html color="success" text="Domains and Aliases" %}

    Disroot lets users use their own domain. They have aliases, however you must manually apply for them.

    @@ -166,7 +166,7 @@

    Tutanota {% include badge.html color="info" text="Free" %}

    -

    Tutanota.com is an email service with a focus on security and privacy through the use of encryption. Tutanota has been in operation since 2011 and is based in Hanover, Germany. Accounts start with 1GB storage with their free plan.

    +

    Tutanota.com is an email service with a focus on security and privacy through the use of encryption. Tutanota has been in operation since 2011 and is based in Hanover, Germany. Accounts start with 1GB storage with their free plan.

    Tutanota doesn't allow the use of third-party email clients. There are plans to allow Tutanota pull email from external email accounts using the IMAP protocol. Email import is currently not possible.

    Emails can be exported individually or by bulk selection. Tutanota does not allow for subfolders as you might expect with other email providers.

    Tutanota is working on a desktop client and they have an app available in F-Droid. They also have their app in conventional stores such as App Store on iOS and Google Play for Android.

    @@ -208,7 +208,7 @@

    StartMail {% include badge.html color="info" text="Personal USD $59.95/y" %}

    -

    StartMail.com is an email service with a focus on security and privacy through the use of standard OpenPGP encryption. StartMail has been in operation since 2014 and is based in Boulevard 11, Zeist Netherlands. Accounts start with 10GB. They offer a 30-day trial.

    +

    StartMail.com is an email service with a focus on security and privacy through the use of standard OpenPGP encryption. StartMail has been in operation since 2014 and is based in Boulevard 11, Zeist Netherlands. Accounts start with 10GB. They offer a 30-day trial.

    {% include badge.html color="success" text="Domains and Aliases" %}

    Personal accounts can use Custom or Generated aliases. Business accounts can use Domain aliases.

    diff --git a/_includes/sections/email-warning.html b/_includes/sections/email-warning.html index ac524a13..6e9f5bf1 100644 --- a/_includes/sections/email-warning.html +++ b/_includes/sections/email-warning.html @@ -3,7 +3,7 @@
    Warning

    When using end-to-end encryption (E2EE) technology like OpenPGP, email will still have some metadata that is not encrypted in the header of the email. Read more about email metadata.

    -

    OpenPGP also does not support Forward secrecy, which means if either your or the recipient's private key is ever stolen, all previous messages encrypted with it will be exposed. How do I protect my private keys?

    +

    OpenPGP also does not support Forward secrecy, which means if either your or the recipient's private key is ever stolen, all previous messages encrypted with it will be exposed. How do I protect my private keys?

    Rather than use email for prolonged conversations, consider using a medium that does support Forward secrecy.

    Recommended Instant Messengers
    diff --git a/_includes/sections/file-encryption.html b/_includes/sections/file-encryption.html index 0d066b1e..9a9b9067 100644 --- a/_includes/sections/file-encryption.html +++ b/_includes/sections/file-encryption.html @@ -1,7 +1,7 @@

    File Encryption Software

    {% @@ -9,7 +9,7 @@ title="VeraCrypt - Disk Encryption" image="/assets/img/svg/3rd-party/veracrypt.svg" image-dark="/assets/img/svg/3rd-party/veracrypt-dark.svg" - 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/" @@ -22,7 +22,7 @@ include cardv2.html title="GNU Privacy Guard - Email Encryption" image="/assets/img/svg/3rd-party/gnupg.svg" - 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." + 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/" privacy-policy="https://gnupg.org/privacy-policy.html" forum="https://forum.privacytools.io/t/discussion-gnupg-file-encryption/1533" @@ -41,7 +41,7 @@ include cardv2.html title="7 Zip" image="/assets/img/svg/3rd-party/7zip.svg" - description='7-Zip is a free and open-source file archiver, a utility used to place groups of files within compressed containers. On Linux, MacOS etc. the command-line tool p7zip is used and integrates into various interfaces such as FileRoller, Xarchiver, Ark.' + description='7-Zip is a free and open-source file archiver, a utility used to place groups of files within compressed containers. On Linux, MacOS etc. the command-line tool p7zip is used and integrates into various interfaces such as FileRoller, Xarchiver, Ark.' website="https://7-zip.org" forum="https://forum.privacytools.io/t/discussion-7-zip/3024" source="https://sourceforge.net/projects/sevenzip/files/" diff --git a/_includes/sections/file-sync.html b/_includes/sections/file-sync.html index bdf50f45..9efbd02c 100644 --- a/_includes/sections/file-sync.html +++ b/_includes/sections/file-sync.html @@ -9,7 +9,7 @@ include cardv2.html title="Syncthing" image="/assets/img/svg/3rd-party/syncthing.svg" - description="Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third-party, and how it is transmitted over the Internet." + description="Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third-party, and how it is transmitted over the Internet." website="https://syncthing.net/" forum="https://forum.privacytools.io/t/discussion-syncthing/1627/2" github="https://github.com/syncthing?type=source" diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html index c0cc44d3..81c94d8e 100644 --- a/_includes/sections/instant-messenger.html +++ b/_includes/sections/instant-messenger.html @@ -4,9 +4,9 @@ + If you are currently using an Instant Messenger like Telegram, LINE, Viber, WhatsApp, or plain SMS, you should pick an alternative here.
    -

    We only recommend instant messenger programs or apps that support end-to-end encryption (E2EE). When E2EE is used, all transmissions (messages, voice, video, etc.) are encrypted before they are sent from your device. E2EE protects both the authenticity and confidentiality of the transmission as they pass through any part of the network (servers, etc.).

    +

    We only recommend instant messenger programs or apps that support end-to-end encryption (E2EE). When E2EE is used, all transmissions (messages, voice, video, etc.) are encrypted before they are sent from your device. E2EE protects both the authenticity and confidentiality of the transmission as they pass through any part of the network (servers, etc.).

    All the client programs/apps we chose are free and open-source software unless otherwise mentioned. This to ensure that the code can be independently verified by experts now and in the future.

    diff --git a/_includes/sections/ios-addons.html b/_includes/sections/ios-addons.html index 6e9da956..5eb07d15 100644 --- a/_includes/sections/ios-addons.html +++ b/_includes/sections/ios-addons.html @@ -8,7 +8,7 @@

    Use a VPN with Passepartout

    -

    Passepartout is a free, open-source, and user friendly OpenVPN app with presets for multiple providers (including Mullvad and ProtonVPN, two PrivacyTools recommended providers) and easy configurability.

    +

    Passepartout is a free, open-source, and user friendly OpenVPN app with presets for multiple providers (including Mullvad and ProtonVPN, two PrivacyTools recommended providers) and easy configurability.

    @@ -18,7 +18,7 @@

    Block content in Safari with AdGuard for iOS

    -

    AdGuard for iOS is a free (and open-source) content-blocking app that allows you to set filters within Safari. As required by iOS, it uses the native Content Blocker API for even greater privacy.

    +

    AdGuard for iOS is a free (and open-source) content-blocking app that allows you to set filters within Safari. As required by iOS, it uses the native Content Blocker API for even greater privacy.

    diff --git a/_includes/sections/key-disclosure-law.html b/_includes/sections/key-disclosure-law.html index c51e857f..fe4a546f 100644 --- a/_includes/sections/key-disclosure-law.html +++ b/_includes/sections/key-disclosure-law.html @@ -55,7 +55,7 @@ -

    * (people who know how to access a system may be ordered to share their knowledge, however, this doesn't apply to the suspect itself or family members.)

    +

    * (people who know how to access a system may be ordered to share their knowledge, however, this doesn't apply to the suspect itself or family members.)

    Related Information

    diff --git a/_includes/sections/notebooks.html b/_includes/sections/notebooks.html index 09fbafee..b50a7054 100644 --- a/_includes/sections/notebooks.html +++ b/_includes/sections/notebooks.html @@ -1,7 +1,7 @@

    Digital Notebook

    {% include cardv2.html diff --git a/_includes/sections/operating-systems.html b/_includes/sections/operating-systems.html index c3b1879d..7efdd909 100644 --- a/_includes/sections/operating-systems.html +++ b/_includes/sections/operating-systems.html @@ -1,7 +1,7 @@

    Introductory Operating Systems

    {% include cardv2.html @@ -27,7 +27,7 @@

    Advanced Operating Systems

    {% include cardv2.html diff --git a/_includes/sections/participate.html b/_includes/sections/participate.html index 674557a7..587cdf47 100644 --- a/_includes/sections/participate.html +++ b/_includes/sections/participate.html @@ -2,7 +2,7 @@

    Participate with suggestions and constructive criticism

    -

    It's important for a website like {{ site.name }} to stay up-to-date. Keep an eye on software updates for the applications listed on our site. Follow recent news about providers that we recommend. We try our best to keep up, but we're not perfect and the internet is changing fast. If you find an error, or you think a provider should not be listed here, or a qualified service provider is missing, or a browser plugin is not the best choice anymore, or anything else... Talk to us please. You can also find us on several Matrix rooms, primarily #general:privacytools.io. XMPP users can join there via #general#privacytools.io@matrix.org. When using our services, users should follow our Code of Conduct.

    +

    It's important for a website like {{ site.name }} to stay up-to-date. Keep an eye on software updates for the applications listed on our site. Follow recent news about providers that we recommend. We try our best to keep up, but we're not perfect and the internet is changing fast. If you find an error, or you think a provider should not be listed here, or a qualified service provider is missing, or a browser plugin is not the best choice anymore, or anything else... Talk to us please. You can also find us on several Matrix rooms, primarily #general:privacytools.io. XMPP users can join there via #general#privacytools.io@matrix.org. When using our services, users should follow our Code of Conduct.

    diff --git a/_includes/sections/password-managers.html b/_includes/sections/password-managers.html index a529e1f3..9264705d 100644 --- a/_includes/sections/password-managers.html +++ b/_includes/sections/password-managers.html @@ -1,14 +1,14 @@

    Password Manager Software

    {% include cardv2.html title="Bitwarden - Cloud/Self-host" image="/assets/img/svg/3rd-party/bitwarden.svg" - 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/" privacy-policy="https://bitwarden.com/privacy/" forum="https://forum.privacytools.io/t/discussion-bitwarden/1343" @@ -34,7 +34,7 @@ include cardv2.html title="KeePassXC - Local" image="/assets/img/svg/3rd-party/keepassxc.svg" - 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." + 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/" privacy-policy="https://keepassxc.org/privacy/" forum="https://forum.privacytools.io/t/discussion-keepassxc/1344/2" @@ -55,7 +55,7 @@ include cardv2.html title="LessPass - Browser" image="/assets/img/svg/3rd-party/lesspass.svg" - 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/" privacy-policy="https://addons.mozilla.org/en-US/firefox/addon/lesspass/privacy/" forum="https://forum.privacytools.io/t/discussion-keepassxc/1344/2" diff --git a/_includes/sections/privacy-resources.html b/_includes/sections/privacy-resources.html index d294f741..9bff691a 100644 --- a/_includes/sections/privacy-resources.html +++ b/_includes/sections/privacy-resources.html @@ -3,39 +3,39 @@

    Guides

    Information

      -
    • Freedom of the Press Foundation - Supporting and defending journalism dedicated to transparency and accountability since 2012.
      • -
    • Erfahrungen.com - German review aggregator website of privacy-related services.
      • -
    • Open Wireless Movement - a coalition of Internet freedom advocates, companies, organizations, and technologists working to develop new wireless technologies and to inspire a movement of Internet openness.
      • -
    • privacy.net - What does the US government know about you?
      • -
    • r/privacytoolsIO Wiki - Our Wiki on reddit.com.
      • -
    • Security Now! - Weekly Internet Security Podcast by Steve Gibson and Leo Laporte.
      • -
    • TechSNAP - Weekly Systems, Network, and Administration Podcast. Every week TechSNAP covers the stories that impact those of us in the tech industry.
      • -
    • Terms of Service; Didn't Read - "I have read and agree to the Terms" is the biggest lie on the web. We aim to fix that.
      • +
    • Freedom of the Press Foundation - Supporting and defending journalism dedicated to transparency and accountability since 2012.
      • +
    • Erfahrungen.com - German review aggregator website of privacy-related services.
      • +
    • Open Wireless Movement - a coalition of Internet freedom advocates, companies, organizations, and technologists working to develop new wireless technologies and to inspire a movement of Internet openness.
      • +
    • privacy.net - What does the US government know about you?
      • +
    • r/privacytoolsIO Wiki - Our Wiki on reddit.com.
      • +
    • Security Now! - Weekly Internet Security Podcast by Steve Gibson and Leo Laporte.
      • +
    • TechSNAP - Weekly Systems, Network, and Administration Podcast. Every week TechSNAP covers the stories that impact those of us in the tech industry.
      • +
    • Terms of Service; Didn't Read - "I have read and agree to the Terms" is the biggest lie on the web. We aim to fix that.

    Tools

      -
    • ipleak.net - IP/DNS Detect - What is your IP, what is your DNS, what informations you send to websites.
      • -
    • The ultimate Online Privacy Test Resource List - A collection of Internet sites that check whether your web browser leaks information.
      • -
    • PRISM Break - We all have a right to privacy, which you can exercise today by encrypting your communications and ending your reliance on proprietary services.
      • -
    • Security in-a-Box - A guide to digital security for activists and human rights defenders throughout the world.
      • -
    • SecureDrop - An open-source whistleblower submission system that media organizations can use to securely accept documents from and communicate with anonymous sources. It was originally created +
    • ipleak.net - IP/DNS Detect - What is your IP, what is your DNS, what informations you send to websites.
      • +
    • The ultimate Online Privacy Test Resource List - A collection of Internet sites that check whether your web browser leaks information.
      • +
    • PRISM Break - We all have a right to privacy, which you can exercise today by encrypting your communications and ending your reliance on proprietary services.
      • +
    • Security in-a-Box - A guide to digital security for activists and human rights defenders throughout the world.
      • +
    • SecureDrop - An open-source whistleblower submission system that media organizations can use to securely accept documents from and communicate with anonymous sources. It was originally created by the late Aaron Swartz and is currently managed by Freedom of the Press Foundation.
      • -
    • Security First - Umbrella is an Android app that provides all the advice needed to operate safely in a hostile environment.
      • -
    • 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
      • +
    • Security First - Umbrella is an Android app that provides all the advice needed to operate safely in a hostile environment.
      • +
    • 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

    Note: Just being open source does not make software secure!

    diff --git a/_includes/sections/productivity-tools.html b/_includes/sections/productivity-tools.html index 41c4feb3..c8378cc1 100644 --- a/_includes/sections/productivity-tools.html +++ b/_includes/sections/productivity-tools.html @@ -4,7 +4,7 @@ include cardv2.html title="CryptPad" image="/assets/img/svg/3rd-party/cryptpad.svg" - 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." + 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/" privacy-policy="https://cryptpad.fr/privacy.html" forum="https://forum.privacytools.io/t/discussion-cryptpad-productivity-tools/1537" @@ -16,7 +16,7 @@ include cardv2.html title="Etherpad" image="/assets/img/svg/3rd-party/etherpad.svg" - 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." + 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" @@ -34,7 +34,7 @@ title="Write.as" image="/assets/img/svg/3rd-party/writeas.svg" image-dark="/assets/img/svg/3rd-party/writeas-dark.svg" - 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." + 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/" privacy-policy="https://write.as/privacy" forum="https://forum.privacytools.io/t/discussion-write-as-productivity-tools/1539" @@ -71,7 +71,7 @@ include cardv2.html title="MAT2" image="/assets/img/svg/3rd-party/mat2.svg" - 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." + 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" @@ -87,7 +87,7 @@ include cardv2.html title="ExifCleaner" image="/assets/img/svg/3rd-party/exifcleaner.svg" - description='ExifCleaner is a freeware, open source graphical app that uses ExifTool to remove exif metadata from images, videos, and PDF documents using a simple drag and drop interface. It supports multi-core batch processing and dark mode.' + description='ExifCleaner is a freeware, open source graphical app that uses ExifTool to remove exif metadata from images, videos, and PDF documents using a simple drag and drop interface. It supports multi-core batch processing and dark mode.' website="https://exifcleaner.com" forum="https://forum.privacytools.io/t/discussion-mat/TODOADDTHIS" github="https://github.com/szTheory/exifcleaner" diff --git a/_includes/sections/quotes.html b/_includes/sections/quotes.html index 49f8bcb5..3268d1c3 100644 --- a/_includes/sections/quotes.html +++ b/_includes/sections/quotes.html @@ -5,7 +5,7 @@

    Glenn Greenwald: Why privacy matters Over the last 16 months, as I've debated this issue around the world, every single time somebody has said to me, "I don't really worry about invasions of privacy because I don't have anything to hide." I always say the same thing to them. I get out a pen, I write down my email address. I say, "Here's my email address. What I want you to do when you get home is email me the passwords to all of your email accounts, not just the nice, respectable work one in your name, but all of them, because I - want to be able to just troll through what it is you're doing online, read what I want to read and publish whatever I find interesting. After all, if you're not a bad person, if you're doing nothing wrong, you should have nothing to hide." Not a single person has taken me up on that offer.

    + want to be able to just troll through what it is you're doing online, read what I want to read and publish whatever I find interesting. After all, if you're not a bad person, if you're doing nothing wrong, you should have nothing to hide." Not a single person has taken me up on that offer.

    diff --git a/_includes/sections/search-engines.html b/_includes/sections/search-engines.html index dc2d5c4b..fccf5986 100644 --- a/_includes/sections/search-engines.html +++ b/_includes/sections/search-engines.html @@ -1,7 +1,7 @@

    Privacy Respecting Search Engines

    {% diff --git a/_includes/sections/self-contained-networks.html b/_includes/sections/self-contained-networks.html index a467ab96..4bfdb5aa 100644 --- a/_includes/sections/self-contained-networks.html +++ b/_includes/sections/self-contained-networks.html @@ -1,7 +1,7 @@

    Self-contained Networks

    {% include cardv2.html @@ -74,7 +74,7 @@
  2. I2P-Bote - End-to-end encrypted decentralized mail system within the I2P network.
  3. GNUnet - GNUnet provides a strong foundation of free software for a global, distributed network that provides security and privacy.
  4. - IPFS and IPFS Companion- A peer-to-peer hypermedia protocol to make the web faster, safer, and more open. IPFS Companion is a browser extension for redirecting queries to a gateway of your choice (generally local). + IPFS and IPFS Companion- A peer-to-peer hypermedia protocol to make the web faster, safer, and more open. IPFS Companion is a browser extension for redirecting queries to a gateway of your choice (generally local). {% include badge.html color="warning" icon="fas fa-exclamation-triangle" diff --git a/_includes/sections/selfhosted-cloud.html b/_includes/sections/selfhosted-cloud.html index ff6899c5..d962d644 100644 --- a/_includes/sections/selfhosted-cloud.html +++ b/_includes/sections/selfhosted-cloud.html @@ -1,13 +1,13 @@

    Self-Hosted Cloud Server Software

    {% include cardv2.html title="Nextcloud" image="/assets/img/svg/3rd-party/nextcloud.svg" - description="Nextcloud is a suite of free and open-source client-server software for creating your own file hosting services on a private server you control. The only limits on storage and bandwidth are the limits on the server provider you choose." + description="Nextcloud is a suite of free and open-source client-server software for creating your own file hosting services on a private server you control. The only limits on storage and bandwidth are the limits on the server provider you choose." website="https://nextcloud.com/" privacy-policy="https://nextcloud.com/privacy/" forum="https://forum.privacytools.io/t/discussion-nextcloud/287" diff --git a/_includes/sections/social-networks.html b/_includes/sections/social-networks.html index 25a498d2..f2e2f1a9 100644 --- a/_includes/sections/social-networks.html +++ b/_includes/sections/social-networks.html @@ -1,7 +1,7 @@

    Decentralized Social Networks

    {% include cardv2.html diff --git a/_includes/sections/social-news-aggregator.html b/_includes/sections/social-news-aggregator.html index 70805e56..9434d1fa 100644 --- a/_includes/sections/social-news-aggregator.html +++ b/_includes/sections/social-news-aggregator.html @@ -1,7 +1,7 @@

    Social News Aggregators

    {% include cardv2.html diff --git a/_includes/sections/teamchat.html b/_includes/sections/teamchat.html index 6a86d563..bf62c19b 100644 --- a/_includes/sections/teamchat.html +++ b/_includes/sections/teamchat.html @@ -5,7 +5,7 @@ {% diff --git a/_includes/sections/tor-operating-systems.html b/_includes/sections/tor-operating-systems.html index 835df24f..88a4791f 100644 --- a/_includes/sections/tor-operating-systems.html +++ b/_includes/sections/tor-operating-systems.html @@ -1,7 +1,7 @@

    Tor-Focused Distributions

    {% include cardv2.html diff --git a/_includes/sections/video-frontends.html b/_includes/sections/video-frontends.html index c2d94c45..c64a7169 100644 --- a/_includes/sections/video-frontends.html +++ b/_includes/sections/video-frontends.html @@ -1,7 +1,7 @@

    Frontends and Proxies

    {% include cardv2.html diff --git a/_includes/sections/voice-video-messenger.html b/_includes/sections/voice-video-messenger.html index f3e39871..83a8ca50 100644 --- a/_includes/sections/voice-video-messenger.html +++ b/_includes/sections/voice-video-messenger.html @@ -1,7 +1,7 @@

    Video/Voice Calling

    {% include cardv2.html diff --git a/_includes/sections/vpn.html b/_includes/sections/vpn.html index dea6080d..64e5c290 100644 --- a/_includes/sections/vpn.html +++ b/_includes/sections/vpn.html @@ -1,7 +1,7 @@

    Recommended VPN Services

    @@ -21,7 +21,7 @@ Mullvad {% include badge.html color="info" text="EUR €60/y" %} -

    Mullvad.net is a fast and inexpensive VPN with a serious focus on transparency and security. They have been in operation since 2009. Mullvad is based in Sweden and does not have a free trial.

    +

    Mullvad.net is a fast and inexpensive VPN with a serious focus on transparency and security. They have been in operation since 2009. Mullvad is based in Sweden and does not have a free trial.

    {% include badge.html color="success" text="35 Countries" %}

    Mullvad has servers in 35 countries at the time of writing this page. Picking a VPN provider with a server nearest to you will reduce latency of the network traffic you send. This is because of a shorter route (less hops) to the destination.

    We also think it's better for the security of the VPN provider's private keys if they use dedicated servers, instead of cheaper shared solutions (with other customers) such as virtual private servers.

    @@ -34,7 +34,7 @@
    {% include badge.html color="success" text="Open Source Clients" %}

    Mullvad provides the source code for their desktop and mobile clients in their GitHub organization.

    {% include badge.html color="success" text="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.

    +

    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.

    {% include badge.html color="success" text="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.

    {% include badge.html color="success" text="IPv6 Support" %}
    @@ -58,7 +58,7 @@ {% include badge.html color="info" text="Basic USD $48/y" %} {% include badge.html color="secondary" text="Plus USD $96/y" %} -

    ProtonVPN.com 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. They offer a further 14% discount for buying a 2 year subscription.

    +

    ProtonVPN.com 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. They offer a further 14% discount for buying a 2 year subscription.

    {% include badge.html color="success" text="44 Countries" %}

    ProtonVPN has servers in 44 countries at the time of writing this page. Picking a VPN provider with a server nearest to you will reduce latency of the network traffic you send. This is because of a shorter route (less hops) to the destination.

    We also think it's better for the security of the VPN provider's private keys if they use dedicated servers, instead of cheaper shared solutions (with other customers) such as virtual private servers.

    @@ -86,7 +86,7 @@ {% include badge.html color="info" text="Standard USD $60/y" %} {% include badge.html color="secondary" text="Pro USD $100/y" %} -

    IVPN.net is another premium VPN provider, and they have been in operation since 2009. IVPN is based in Gibraltar.

    +

    IVPN.net is another premium VPN provider, and they have been in operation since 2009. IVPN is based in Gibraltar.

    {% include badge.html color="success" text="32 Countries" %}

    IVPN has servers in 32 countries at the time of writing this page. Picking a VPN provider with a server nearest to you will reduce latency of the network traffic you send. This is because of a shorter route (less hops) to the destination.

    We also think it's better for the security of the VPN provider's private keys if they use dedicated servers, instead of cheaper shared solutions (with other customers) such as virtual private servers.

    @@ -95,7 +95,7 @@
    {% include badge.html color="success" text="Open Source Clients" %}

    As of Feburary 2020 IVPN applications are now open source. Source code can be obtained from their GitHub organization.

    {% include badge.html color="success" text="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.

    +

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

    {% include badge.html color="success" text="WireGuard Support" %}

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

    {% include badge.html color="success" text="Remote Port Forwarding" %}
    @@ -109,5 +109,5 @@
    diff --git a/_includes/sections/windows10.html b/_includes/sections/windows10.html index 5717ded8..81bde5f9 100644 --- a/_includes/sections/windows10.html +++ b/_includes/sections/windows10.html @@ -1,13 +1,13 @@

    Don't use Windows 10 - It's a privacy nightmare

    Windows 10 Privacy
      -
    1. Data syncing is by default enabled. +
    2. Data syncing is by default enabled.
      • Browsing history and open websites.
      • Apps settings.
        • @@ -15,13 +15,13 @@
      3. -
    3. Your device is by default tagged with a unique advertising ID. +
    4. Your device is by default tagged with a unique advertising ID.
      • Used to serve you with personalized advertisements by third-party advertisers and ad networks.
      5. -
    5. Cortana can collect any of your data. +
    6. Cortana can collect any of your data.
      • Your keystrokes, searches and mic input.
      @@ -39,7 +39,7 @@
      7. -
    7. Microsoft can collect any personal data. +
    8. Microsoft can collect any personal data.
      • Your identity.
      @@ -66,7 +66,7 @@
      9. -
    9. Your data can be shared. +
    10. Your data can be shared.
      • When downloading Windows 10, you are authorizing Microsoft to share any of above-mentioned data with any third-party, with or without your consent.
      diff --git a/_includes/sponsors/silver.html b/_includes/sponsors/silver.html index 55f493d5..fedd52fa 100644 --- a/_includes/sponsors/silver.html +++ b/_includes/sponsors/silver.html @@ -2,7 +2,7 @@
      Techlore Logo
      -

      Techlore

      +

      Techlore

      https://techlore.tech
      @@ -11,7 +11,7 @@
      Awesome Resources Logo
      -

      Awesome Resources Ltd

      +

      Awesome Resources Ltd

      https://www.awesomeresources.co.uk
      @@ -20,7 +20,7 @@
      Look To The Right Logo
      -

      Look To The Right

      +

      Look To The Right

      https://looktotheright.com
      @@ -29,7 +29,7 @@
      scams.info
      -

      scams.info

      +

      scams.info

      https://www.scams.info
      diff --git a/pages/about/about.html b/pages/about/about.html index e826da2a..99a16446 100644 --- a/pages/about/about.html +++ b/pages/about/about.html @@ -12,9 +12,9 @@ hidedesc: true
      -

      You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities.

      -

      At PrivacyTools, we provide services, tools, and knowledge to protect your privacy against global mass surveillance, and moderate a thriving community of privacy-minded individuals like yourself to discuss and learn about new advances in protecting your online data. serves as the centerpiece of our organization, where we research and recommend various software solutions for our community.

      -

      Transparency is our strongest value, and it's what sets us apart from the rest of the "privacy recommendations" community. Editorial changes to this website and the products we recommend are always discussed on our extensive issue tracker, drafted in a public pull request open for further discussion, and logged in a comprehensive commit log dating back to our original founding date in 2015. The core team members listed below are responsible for most of the edits and final decisions to changes on this website and across our services, but this website is truly the work of hundreds contributors and fact checkers working to make sure our recommendations are solid and trustworthy.

      +

      You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities.

      +

      At PrivacyTools, we provide services, tools, and knowledge to protect your privacy against global mass surveillance, and moderate a thriving community of privacy-minded individuals like yourself to discuss and learn about new advances in protecting your online data. serves as the centerpiece of our organization, where we research and recommend various software solutions for our community.

      +

      Transparency is our strongest value, and it's what sets us apart from the rest of the "privacy recommendations" community. Editorial changes to this website and the products we recommend are always discussed on our extensive issue tracker, drafted in a public pull request open for further discussion, and logged in a comprehensive commit log dating back to our original founding date in 2015. The core team members listed below are responsible for most of the edits and final decisions to changes on this website and across our services, but this website is truly the work of hundreds contributors and fact checkers working to make sure our recommendations are solid and trustworthy.

      Additionally, we are a not-for-profit organization. We do not utilize paid recommendations or affiliate programs to make the recommendations on this website. Unfortunately this practice is very common elsewhere online, which makes it difficult to trust other review sites. We are unique in this area, in that all of our research is conducted independently, and we will never accept payments to modify, add, or remove any of our reviews or recommendations. Our finances are provided entirely by our community donors and sponsors, and are handled by the Open Collective Foundation 501(c)(3). Because we are operating as a charity in the United States, we are legally obligated to only use our funding to further our mission of spreading privacy education and promoting online services like Mastodon, Matrix, and WriteFreely. This website is a public resource, not a profit generator. To that regard, all our financial transactions (incoming and outgoing) are logged and made available to the public via our page at opencollective.com/privacytools.

      We take the operation of our various services very seriously, and require all participants to adhere to our Code of Conduct. For any questions or to report abuse, please see our CoC’s Enforcement section.

      diff --git a/pages/donate.html b/pages/donate.html index 9ffe5f28..be344b6b 100644 --- a/pages/donate.html +++ b/pages/donate.html @@ -15,7 +15,7 @@ permalink: /donate/
      Donate via OpenCollective
      -

      If you are able, please consider contributing to our development and outreach programs. Contributions via OpenCollective to {{ site.name }} are tax deductible for US taxpayers. These funds are transparently and primarily used to cover server costs.

      +

      If you are able, please consider contributing to our development and outreach programs. Contributions via OpenCollective to {{ site.name }} are tax deductible for US taxpayers. These funds are transparently and primarily used to cover server costs.

      Contribute More Info
      @@ -32,49 +32,49 @@ permalink: /donate/
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      @@ -96,203 +96,203 @@ permalink: /donate/
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      - +
      diff --git a/pages/providers/email.html b/pages/providers/email.html index ac9a6f64..2f4c37a4 100644 --- a/pages/providers/email.html +++ b/pages/providers/email.html @@ -12,7 +12,7 @@ description: "Find a secure email provider that will keep your privacy in mind.

      Our Email 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 Email provider wishing to be recommended, including implementing industry best practices, modern technology and more. We suggest you familiarize yourself with this list before choosing an Email provider, and conduct your own research to ensure the Email provider you choose is the right choice for you.

      +

      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 Email provider wishing to be recommended, including implementing industry best practices, modern technology and more. We suggest you familiarize yourself with this list before choosing an Email provider, and conduct your own research to ensure the Email provider you choose is the right choice for you.

      @@ -21,13 +21,13 @@ description: "Find a secure email provider that will keep your privacy in mind.

      Operating outside the five/nine/fourteen-eyes countries is not necessarily a guarantee of privacy, 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:

      +

      Minimum to Qualify:

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

      Best Case:

      +

      Best Case:

      • Operating outside the USA or other Fourteen Eyes countries.
      • Operating inside a country with strong consumer protection laws.
        • @@ -39,14 +39,14 @@ description: "Find a secure email provider that will keep your privacy in mind.

        We regard these features as important in order to provide a safe and optimal service to users. Users should consider the provider which has the features they require.

      -

      Minimum to Qualify:

      +

      Minimum to Qualify:

      • Encrypts account data at rest.
      • Integrated webmail encryption provides convenience to users who want improve on having no E2EE encryption.
      -

      Best Case:

      +

      Best Case:

      • Encrypts account data at rest with zero-access encryption.
      • Allow users to use their own domain name. Custom domain names are important to users because it allows them to maintain their agency from the service, should it turn bad, be acquired by another company which doesn't prioritize privacy etc.
        • @@ -64,7 +64,7 @@ description: "Find a secure email provider that will keep your privacy in mind.

        We prefer our recommended providers to collect as little data as possible.

      -

      Minimum to Qualify:

      +

      Minimum to Qualify:

      • Protect sender's IP address. Filter it from showing in the Received header field.
      • Don't require personally identifiable information (PII) besides username and password.
        • @@ -72,7 +72,7 @@ description: "Find a secure email provider that will keep your privacy in mind.
      -

      Best Case:

      +

      Best Case:

      • Accepts Bitcoin, cash, and other forms of cryptocurrency and/or anonymous payment options (gift cards, etc.)
      @@ -83,7 +83,7 @@ description: "Find a secure email provider that will keep your privacy in mind.

      Email servers deal with a lot of very sensitive data. We expect that providers will adopt best industry practices in order to protect their users.

      -

      Minimum to Qualify:

      +

      Minimum to Qualify:

      • Protection of webmail with two-factor authentication (2FA), such as TOTP.
      • Encryption at rest, (e.g. dm-crypt) this protects the contents of the servers in case of unlawful seizure.
        • @@ -102,7 +102,7 @@ description: "Find a secure email provider that will keep your privacy in mind.
      -

      Best Case:

      +

      Best Case:

      • Support for hardware authentication, ie U2F and WebAuthn. U2F and WebAuthn are more secure as they use a private key stored on a client-side hardware device to authenticate users, as opposed to a shared secret that is stored on the web server and on the client side when using TOTP. Furthermore, U2F and WebAuthn are more resistant to phishing as their authentication response is based on the authenticated domain name.
      • Zero access encryption, builds on encryption at rest. The difference being the provider does not have the decryption keys to the data they hold. This prevents a rogue employee leaking data they have access to or remote adversary from releasing data they have stolen by gaining unauthorized access to the server.
        • @@ -122,13 +122,13 @@ description: "Find a secure email provider that will keep your privacy in mind.

        You wouldn't trust your finances to someone with a fake identity, so why trust them with your email? 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:

      +

      Minimum to Qualify:

      • Public-facing leadership or ownership.
      -

      Best Case:

      +

      Best Case:

      • Public-facing leadership.
      • Frequent transparency reports.
        • @@ -140,7 +140,7 @@ description: "Find a secure email provider that will keep your privacy in mind.

        With the email providers we recommend we like to see responsible marketing.

      -

      Minimum to Qualify:

      +

      Minimum to Qualify:

      • Must self host analytics (no Google Analytics etc). The provider's site must also comply with DNT (Do Not Track) for those users who want to opt-out.
      @@ -155,7 +155,7 @@ description: "Find a secure email provider that will keep your privacy in mind.
      -

      Best Case:

      +

      Best Case:

      • Clear and easy to read documentation. This includes things like, setting up 2FA, email clients, OpenPGP, etc.
      @@ -223,14 +223,14 @@ description: "Find a secure email provider that will keep your privacy in mind. alt="AnonAddy">
      -

      AnonAddy lets users create aliases that forward to their email address. Can be self-hosted. Source code on GitHub.

      +

      AnonAddy lets users create aliases that forward to their email address. Can be self-hosted. Source code on GitHub.

      SimpleLogin
      -

      SimpleLogin allows you to easily create aliases for your email. Can be self-hosted. Source code on GitHub.

      +

      SimpleLogin allows you to easily create aliases for your email. Can be self-hosted. Source code on GitHub.

      Self-hosting Email

      @@ -243,13 +243,13 @@ description: "Find a secure email provider that will keep your privacy in mind. alt="Mail-in-a-Box">
      -

      Mail-in-a-Box is an automated setup script for deploying a mail server on Ubuntu. Its goal is to make it easier for users to set up their own mail server.

      +

      Mail-in-a-Box is an automated setup script for deploying a mail server on Ubuntu. Its goal is to make it easier for users to set up their own mail server.

      Mailcow -

      Mailcow is a more advanced mail server perfect for those with a bit more Linux experience. It has everything you need in a Docker container: A mailserver with DKIM support, antivirus and spam monitoring, webmail and ActiveSync with SOGo, and web-based administration with 2FA support. Mailcow Dockerized docs

      +

      Mailcow is a more advanced mail server perfect for those with a bit more Linux experience. It has everything you need in a Docker container: A mailserver with DKIM support, antivirus and spam monitoring, webmail and ActiveSync with SOGo, and web-based administration with 2FA support. Mailcow Dockerized docs

      For a more manual approach we've picked out these two articles.

        diff --git a/pages/providers/vpn.html b/pages/providers/vpn.html index 3cb1d8aa..5aa53199 100644 --- a/pages/providers/vpn.html +++ b/pages/providers/vpn.html @@ -9,10 +9,10 @@ breadcrumb: "VPN"
        Warning
        -

        Using a VPN will not keep your browsing habits anonymous, nor will it add additional security to non-secure (HTTP) traffic.

        -

        If you are looking for anonymity, you should use the Tor Browser instead of a VPN.

        -

        If you're looking for added security, you should always ensure you're connecting to websites using encrypted DNS and HTTPS. A VPN is not a replacement for good security practices.

        -

        If you're looking for additional privacy from your ISP, on a public Wi-Fi network, or while torrenting files, a VPN may be the solution for you as long as you understand the risks involved.

        +

        Using a VPN will not keep your browsing habits anonymous, nor will it add additional security to non-secure (HTTP) traffic.

        +

        If you are looking for anonymity, you should use the Tor Browser instead of a VPN.

        +

        If you're looking for added security, you should always ensure you're connecting to websites using encrypted DNS and HTTPS. A VPN is not a replacement for good security practices.

        +

        If you're looking for additional privacy from your ISP, on a public Wi-Fi network, or while torrenting files, a VPN may be the solution for you as long as you understand the risks involved.

        Download Tor Tor Myths & FAQ More Info @@ -24,7 +24,7 @@ breadcrumb: "VPN"

        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.

        +

        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.

        @@ -33,13 +33,13 @@ breadcrumb: "VPN"

        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:

        +

        Minimum to Qualify:

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

        Best Case:

        +

        Best Case:

        • Operating outside the USA or other Fourteen Eyes countries.
        • Operating inside a country with strong consumer protection laws.
          • @@ -48,10 +48,10 @@ breadcrumb: "VPN"

          {% include badge.html color="info" text="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 killswitch to block network data leaks when disconnected.

          +

          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 killswitch to block network data leaks when disconnected.

          -

          Minimum to Qualify:

          +

          Minimum to Qualify:

          • OpenVPN support.
          • Killswitch built in to clients.
            • @@ -59,7 +59,7 @@ breadcrumb: "VPN"
          -

          Best Case:

          +

          Best Case:

          • OpenVPN and WireGuard support.
          • Killswitch with highly configurable options (enable/disable on certain networks, on boot, etc.)
            • @@ -74,14 +74,14 @@ breadcrumb: "VPN"

            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:

          +

          Minimum to Qualify:

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

          Best Case:

          +

          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.)
            • @@ -93,7 +93,7 @@ breadcrumb: "VPN"

            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:

          +

          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).
            • @@ -101,7 +101,7 @@ breadcrumb: "VPN"
          -

          Best Case:

          +

          Best Case:

          • Strongest Encryption: RSA-4096.
          • Perfect Forward Secrecy (PFS).
            • @@ -115,13 +115,13 @@ breadcrumb: "VPN"

            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:

          +

          Minimum to Qualify:

          • Public-facing leadership or ownership.
          -

          Best Case:

          +

          Best Case:

          • Public-facing leadership.
          • Frequent transparency reports.
            • @@ -133,7 +133,7 @@ breadcrumb: "VPN"

            With the VPN providers we recommend we like to see responsible marketing.

          -

          Minimum to Qualify:

          +

          Minimum to Qualify:

          • Must self host analytics (no Google Analytics etc). The provider's site must also comply with DNT (Do Not Track) for those users who want to opt-out.
          @@ -150,7 +150,7 @@ breadcrumb: "VPN"
        -

        Best Case:

        +

        Best Case:

        Responsible marketing that is both educational and useful to the consumer could include:

        • A accurate comparison to when Tor or other Self contained networks should be used.
          • @@ -172,35 +172,35 @@ breadcrumb: "VPN"

          Should I use a VPN?

          -

          The answer to this question is not a particularly helpful one: It depends. It depends on what you're expecting a VPN to do for you, who you're trying to hide your traffic from, and what applications you're using.

          -

          In most cases, VPNs do little to protect your privacy or enhance your security, unless paired with other changes.

          +

          The answer to this question is not a particularly helpful one: It depends. It depends on what you're expecting a VPN to do for you, who you're trying to hide your traffic from, and what applications you're using.

          +

          In most cases, VPNs do little to protect your privacy or enhance your security, unless paired with other changes.

          VPNs cannot encrypt data outside of the connection between your device and the VPN server. VPN providers can see and modify your traffic the same way your ISP could. And there is no way to verify a VPN provider's "no logging" policies in any way.

          What if I need encryption?

          -

          In most cases, most of your traffic is already encrypted! Over 98% of the top 3000 websites offer HTTPS, meaning your non-DNS traffic is safe regardless of using a VPN. It is incredibly rare for applications that handle personal data to not support HTTPS in 2019, especially with services like Let's Encrypt offering free HTTPS certificates to any website operator.

          +

          In most cases, most of your traffic is already encrypted! Over 98% of the top 3000 websites offer HTTPS, meaning your non-DNS traffic is safe regardless of using a VPN. It is incredibly rare for applications that handle personal data to not support HTTPS in 2019, especially with services like Let's Encrypt offering free HTTPS certificates to any website operator.

          Even if a site you visit doesn't support HTTPS, a VPN will not protect you, because a VPN cannot magically encrypt the traffic between the VPN's servers and the website's servers. Installing an extension like HTTPS Everywhere and making sure every site you visit uses HTTPS is far more helpful than using a VPN.

          Should I use encrypted DNS with a VPN?

          -

          The answer to this question is also not very helpful: it depends. Your VPN provider may have their own DNS servers, but if they don't, the traffic between your VPN provider and the DNS server isn't encrypted. You need to trust the encrypted DNS provider in addition to the VPN provider and unless your client and target server support encrypted SNI, the VPN provider can still see which domains you are visiting.

          -

          However you shouldn't use encrypted DNS with Tor. This would direct all of your DNS requests through a single circuit, and would allow the encrypted DNS provider to deanonymize you.

          +

          The answer to this question is also not very helpful: it depends. Your VPN provider may have their own DNS servers, but if they don't, the traffic between your VPN provider and the DNS server isn't encrypted. You need to trust the encrypted DNS provider in addition to the VPN provider and unless your client and target server support encrypted SNI, the VPN provider can still see which domains you are visiting.

          +

          However you shouldn't use encrypted DNS with Tor. This would direct all of your DNS requests through a single circuit, and would allow the encrypted DNS provider to deanonymize you.

          What if I need anonymity?

          VPNs cannot provide strong anonymity. Your VPN provider will still see your real IP address, and often has a money trail that can be linked directly back to you. You cannot rely on "no logging" policies to protect your data.

          Shouldn't I hide my IP address?

          -

          The idea that your IP address is sensitive information, or that your location is given away with all your internet traffic is fearmongering on the part of VPN providers and their marketing. Your IP address is an insignificant amount of personal data tracking companies use to identify you, because many users' IP addresses change very frequently (Dynamic IP addresses, switching networks, switching devices, etc.). Your IP address also does not give away more than the very generalized location of your Internet Service Provider. It does not give away your home address, for example, despite common perception.

          -

          Should I use Tor and a VPN?

          +

          The idea that your IP address is sensitive information, or that your location is given away with all your internet traffic is fearmongering on the part of VPN providers and their marketing. Your IP address is an insignificant amount of personal data tracking companies use to identify you, because many users' IP addresses change very frequently (Dynamic IP addresses, switching networks, switching devices, etc.). Your IP address also does not give away more than the very generalized location of your Internet Service Provider. It does not give away your home address, for example, despite common perception.

          +

          Should I use Tor and a VPN?

          By using a VPN with Tor, you're creating essentially a permanent entry node, often with a money trail attached. This provides 0 additional benefit to you, while increasing the attack surface of your connection dramatically. If you wish to hide your Tor usage from your ISP or your government, Tor has a built-in solution for that: Tor bridges. Read more about Tor bridges and why using a VPN is not necessary.

          Are VPNs ever useful?

          A VPN may still be useful to you in a variety of scenarios, such as:

            -
          1. Hiding your traffic from only your Internet Service Provider.
            2. +
          2. Hiding your traffic from only your Internet Service Provider.
          3. Hiding your downloads (such as torrents) from your ISP and anti-piracy organizations.
          -

          For use cases like these, or if you have another compelling reason, the VPN providers we listed above are who we think are the most trustworthy. However, using a VPN provider still means you're trusting the provider. In pretty much any other scenario you should be using a secure-by-design tool such as Tor.

          +

          For use cases like these, or if you have another compelling reason, the VPN providers we listed above are who we think are the most trustworthy. However, using a VPN provider still means you're trusting the provider. In pretty much any other scenario you should be using a secure-by-design tool such as Tor.

          -

          Sources and Further Reading: +

          Sources and Further Reading:

          1. VPN - a Very Precarious Narrative by Dennis Schubert
          2. Don't use VPN services by Sven Slootweg
            3. diff --git a/pages/services/chat.html b/pages/services/chat.html index 56aaa20d..911e1333 100644 --- a/pages/services/chat.html +++ b/pages/services/chat.html @@ -19,7 +19,7 @@ description: "chat.privacytools.io is our official Matrix homeserver. You can re

          Connection Information

          -

          To register on or connect to our homeserver, simply use https://chat.privacytools.io as the homeserver in your Matrix client.

          +

          To register on or connect to our homeserver, simply use https://chat.privacytools.io as the homeserver in your Matrix client.

          You must read and accept our community code of conduct before joining our rooms or using our services.

          {% @@ -41,14 +41,14 @@ description: "chat.privacytools.io is our official Matrix homeserver. You can re web="https://app.element.io" %} -

          If you're asked to enter a custom homeserver URL in a Matrix client, enter https://chat.privacytools.io, not privacytools.io or element.privacytools.io. You do not need to change your identity server, in fact https://vector.im is the only functional one, by design.

          +

          If you're asked to enter a custom homeserver URL in a Matrix client, enter https://chat.privacytools.io, not privacytools.io or element.privacytools.io. You do not need to change your identity server, in fact https://vector.im is the only functional one, by design.

          These details will be autofilled for you in most clients if you enter your full username (e.g. @alice:privacytools.io rather than alice) into the username field. In general it is preferable to do that rather than trying to remember what the homeserver URL is.

          Frequently Asked Questions

          Is #general:privacytools.io or #privacy:privacytools.io chat end-to-end encrypted?

          -

          No. Messages sent to the #general chat are encrypted from with client-to-server encryption, i.e. HTTPS. This means that your messages can't be viewed by an attacker on your network, or your ISP, etc. However, because this is a public chat room anybody can view your messages if they are a member, and newcomers will be able to see all message history. Do not say anything in rooms that don't use End-to-End (E2E) encryption that you wouldn't want tied to you personally.

          +

          No. Messages sent to the #general chat are encrypted from with client-to-server encryption, i.e. HTTPS. This means that your messages can't be viewed by an attacker on your network, or your ISP, etc. However, because this is a public chat room anybody can view your messages if they are a member, and newcomers will be able to see all message history. Do not say anything in rooms that don't use End-to-End (E2E) encryption that you wouldn't want tied to you personally.

          Isn't Matrix behind Cloudflare?

          The default matrix.org homeserver is behind Cloudflare. The PrivacyTools homeserver is not. @@ -56,7 +56,7 @@ description: "chat.privacytools.io is our official Matrix homeserver. You can re

          Isn't Matrix slow?

          It can be, for some! Due to the trememdous amount of people registering on the matrix.org homeserver, it is often overloaded and occasionally slow to respond. Therefore, users on that homeserver occasionally report a less than ideal chat experience. If that's you, you can fix this problem by switching to another homeserver. Good alternatives include...

            -
          • ours of course, at chat.privacytools.io, you're here right?
            • +
          • ours of course, at chat.privacytools.io, you're here right?
          • feneas.org, tchncs.de, weho.st, pine64.org, kde.org, halogen.city...
          • purchasing an instance from Element Matrix Services
          • running your own by installing Synapse — certainly the best option for the technically inclined!
            • @@ -78,10 +78,10 @@ description: "chat.privacytools.io is our official Matrix homeserver. You can re
            • #dev:privacytools.io: Discussions relating to building www.privacytools.io.
            • #forum:privacytools.io: All PrivacyTools Forum updates (Automated).
              • -
            • #general:privacytools.io: Main discussion room.
              • +
            • #general:privacytools.io: Main discussion room.
            • #github:privacytools.io: GitHub updates for @privacytools (Automated).
            • #guides:privacytools.io: Privacy Guides development work.
              • -
            • #privacy:privacytools.io: On-topic privacy, security, opsec discussion and support.
              • +
            • #privacy:privacytools.io: On-topic privacy, security, opsec discussion and support.
            • #wiki:privacytools.io: Wiki-building discussion room.

            If you're looking for more things to chat about, check out these rooms as well:

            diff --git a/pages/services/services.html b/pages/services/services.html index fe374139..ac0be47c 100644 --- a/pages/services/services.html +++ b/pages/services/services.html @@ -19,7 +19,7 @@ description: "The PrivacyTools team is proud to introduce a suite of privacy-cen
          -

          More services are on the way. If there's something that would be super beneficial for us to run, don't hesitate to reach out and ask. And of course, if you like our services, please consider donating to support our server costs, any donation helps!

          +

          More services are on the way. If there's something that would be super beneficial for us to run, don't hesitate to reach out and ask. And of course, if you like our services, please consider donating to support our server costs, any donation helps!

            @@ -30,8 +30,8 @@ description: "The PrivacyTools team is proud to introduce a suite of privacy-cen

            A brief note

            We are providing these services because we believe in decentralized and federated networks, and free and open source software. The tools we host are a great and convenient entry-point to these services like Matrix, Mastodon, and WriteFreely. We hope that we are able to spur the adoption of these alternative networks, and we strongly believe all of our services are far better than traditional providers, such as Twitter, Facebook, and Google.

            -

            However, as with any hosted, online service, remember that using our services involves risks that may or may not be acceptable to you. Using online services requires trust in the service provider. We don't know of any surefire way to evaluate a provider for privacy, or provide a service that we can guarantee is operating in a privacy-respecting way. Of course we strive to provide the best services possible for our community, but at the end of the day this involves you trusting us and the system administrators that host our services.

            -

            As always, never trust a service provider with sensitive information, even if they are trustworthy.

            +

            However, as with any hosted, online service, remember that using our services involves risks that may or may not be acceptable to you. Using online services requires trust in the service provider. We don't know of any surefire way to evaluate a provider for privacy, or provide a service that we can guarantee is operating in a privacy-respecting way. Of course we strive to provide the best services possible for our community, but at the end of the day this involves you trusting us and the system administrators that host our services.

            +

            As always, never trust a service provider with sensitive information, even if they are trustworthy.

            We also recommend you don't centralize all your online activity around a single provider's services (such as ours). This is because it is not a good idea to give a single party control over everything you do online.

            We highly recommend hosting your own services whenever possible. Not only is it a fantastic learning experience, but it allows you to have services entirely in your control. There are a number of great resources available, including...

              diff --git a/pages/sponsors.html b/pages/sponsors.html index 081c0dd4..b859f3e4 100644 --- a/pages/sponsors.html +++ b/pages/sponsors.html @@ -8,13 +8,13 @@ permalink: /sponsors/

              Sponsors of {{ site.name }}

              -

              A massive thank you to the following organization-level sponsors of {{ site.name }}, who pledge $250+:

              +

              A massive thank you to the following organization-level sponsors of {{ site.name }}, who pledge $250+:

              {% include sponsors/gold.html %}
              -

              The {{ site.name }} website and services are a community project. There is no advertising, affiliate links, or other forms of monetization.
              Your donations here directly support hosting this website and compensating contributors to this project.

              +

              The {{ site.name }} website and services are a community project. There is no advertising, affiliate links, or other forms of monetization.
              Your donations here directly support hosting this website and compensating contributors to this project.

              Become a Sponsor Donate Directly @@ -40,15 +40,15 @@ permalink: /sponsors/

              With this exposure and sponsorship, your customers will recognize your intrinsic understanding and commitment to user privacy. Moreover, you'll directly contribute to our mission of spreading privacy-respecting tools and knowledge worldwide!

              At PrivacyTools, we believe in...

                -
              • Privacy, of course. Privacy gives you as a user control over how your information is used and spread online. Trustworthy and secure products and services are the key to that future.
                • -
              • Security. We believe services cannot provide privacy at all without being secure. Strong encryption is the only way to prevent malicious actors from snooping in on our communications.
                • -
              • Freedom. The right to express your opinion online without interference or surveillance is the only way we can grow as a society, and privacy-respecting tools should foster that growth.
                • +
              • Privacy, of course. Privacy gives you as a user control over how your information is used and spread online. Trustworthy and secure products and services are the key to that future.
                • +
              • Security. We believe services cannot provide privacy at all without being secure. Strong encryption is the only way to prevent malicious actors from snooping in on our communications.
                • +
              • Freedom. The right to express your opinion online without interference or surveillance is the only way we can grow as a society, and privacy-respecting tools should foster that growth.

              We reserve the right or deny all sponsors from receiving the benefits detailed below if we believe that your organization or product is not aligned with our key values. Therefore, if you are interested in sponsoring our project, please first email sponsors@privacytools.io so we may discuss further.

              As a sponsor of {{ site.name }}, your company will be widely recognized in a variety of ways, some of which we've detailed below.

              General Information

              This website receives well over 250,000 pageviews on a monthly basis and is highly ranked for privacy-related keywords. In addition to the benefits below your contribution will be featured on our OpenCollective page and we will thank you via social media for your contribution.

              -

              Please note that this page is updated manually, and while we're generally on top of things, please don't hesitate to reach out to sponsors@privacytools.io if you think we've missed something :)

              +

              Please note that this page is updated manually, and while we're generally on top of things, please don't hesitate to reach out to sponsors@privacytools.io if you think we've missed something :)

              Backers - $10–$24
              • Your name added to the list of sponsors on this page.
                • @@ -68,7 +68,7 @@ permalink: /sponsors/
                We will not provide...

                We pride ourselves on our integrity and commitment to spreading unbiased and fact-based information regarding privacy and privacy-respecting tools. All tools we recommend throughout our website are subject to strict criteria as judged by our team and the community across our various platforms. Your sponsorship will not grant your organization any special consideration when choosing our recommendations throughout the website, a process which we make clear via our transparent ledger on OpenCollective and our public discussions on GitHub. Your sponsorship benefits are limited to those outlined above.

                Tax and Financial Information
                -

                Your contribution to {{ site.name }} will be handled by the Open Collective Foundation 501(c)(3). For US companies and taxpayers, this means your contribution is likely tax deductible, but you should consult with your accountant regarding your specific circumstances. As a non-profit, your sponsorship contribution will not be used for private profit and will only be used to cover expenses incurred by the project. All of our transactions (donations and expenses) are published transparently on OpenCollective. For the benefit of our readership, anonymous contributions will not be eligible for the sponsorship opportunities outlined above.

                +

                Your contribution to {{ site.name }} will be handled by the Open Collective Foundation 501(c)(3). For US companies and taxpayers, this means your contribution is likely tax deductible, but you should consult with your accountant regarding your specific circumstances. As a non-profit, your sponsorship contribution will not be used for private profit and will only be used to cover expenses incurred by the project. All of our transactions (donations and expenses) are published transparently on OpenCollective. For the benefit of our readership, anonymous contributions will not be eligible for the sponsorship opportunities outlined above.

                More Information

                If you are interested and have further questions, you are welcome to reach out to us directly at sponsors@privacytools.io.

                -- 2.47.2 From 5d41ea02d93655ffa6ab6121f0fd4a74384e67f1 Mon Sep 17 00:00:00 2001 From: "J. C" <73438877+1hiking@users.noreply.github.com> Date: Sat, 1 May 2021 17:09:44 -0500 Subject: [PATCH 2/6] Changes b and i to em and strong --- 404.html | 10 +-- _includes/badge.html | 8 +- _includes/breadcrumbs.html | 2 +- _includes/card.html | 4 +- _includes/cardv2.html | 84 +++++++++---------- _includes/footer.html | 16 ++-- _includes/sections/android-addons.html | 2 +- .../sections/android-operating-systems.html | 4 +- _includes/sections/browser-addons.html | 4 +- _includes/sections/browser-fingerprint.html | 6 +- .../sections/browser-recommendation.html | 6 +- _includes/sections/browser-tweaks.html | 2 +- _includes/sections/browser-webrtc.html | 6 +- .../sections/calendar-contacts-sync.html | 2 +- _includes/sections/cloud-storage.html | 2 +- _includes/sections/decentralized-video.html | 2 +- _includes/sections/dns.html | 14 ++-- _includes/sections/email-clients.html | 8 +- _includes/sections/email-providers.html | 14 ++-- _includes/sections/email-warning.html | 2 +- _includes/sections/file-encryption.html | 2 +- _includes/sections/file-sharing.html | 2 +- _includes/sections/file-sync.html | 2 +- _includes/sections/fourteen-eyes.html | 2 +- _includes/sections/header.html | 2 +- _includes/sections/hosting-provider.html | 2 +- _includes/sections/instant-messenger.html | 8 +- _includes/sections/ios-addons.html | 2 +- _includes/sections/key-disclosure-law.html | 2 +- _includes/sections/notebooks.html | 2 +- _includes/sections/operating-systems.html | 4 +- .../other-mobile-operating-systems.html | 2 +- _includes/sections/participate.html | 2 +- _includes/sections/password-managers.html | 2 +- _includes/sections/paste-services.html | 2 +- _includes/sections/privacy-resources.html | 2 +- _includes/sections/productivity-tools.html | 4 +- _includes/sections/quotes.html | 2 +- _includes/sections/resources.html | 2 +- _includes/sections/router-firmware.html | 2 +- _includes/sections/search-engines.html | 2 +- .../sections/self-contained-networks.html | 2 +- _includes/sections/selfhosted-cloud.html | 2 +- _includes/sections/social-networks.html | 2 +- .../sections/social-news-aggregator.html | 2 +- _includes/sections/teamchat.html | 2 +- _includes/sections/tor-operating-systems.html | 2 +- _includes/sections/video-frontends.html | 2 +- _includes/sections/voice-video-messenger.html | 2 +- _includes/sections/vpn.html | 8 +- _includes/sections/warrant-canary.html | 2 +- _includes/sections/windows10.html | 2 +- _includes/team.html | 14 ++-- index.html | 2 +- pages/about/about.html | 12 +-- pages/donate.html | 16 ++-- pages/os.html | 2 +- pages/providers.html | 2 +- pages/providers/email.html | 12 +-- pages/providers/vpn.html | 6 +- pages/services/services.html | 16 ++-- pages/software/real-time-communication.html | 2 +- pages/sponsors.html | 8 +- 63 files changed, 185 insertions(+), 185 deletions(-) diff --git a/404.html b/404.html index 6e8e7276..bf23a26f 100644 --- a/404.html +++ b/404.html @@ -11,13 +11,13 @@ active_page: 404
                -

                If you believe you reached this page in error, please contact us!

                +

                If you believe you reached this page in error, please contact us!

              diff --git a/_includes/badge.html b/_includes/badge.html index f069d819..2a2738de 100644 --- a/_includes/badge.html +++ b/_includes/badge.html @@ -3,8 +3,8 @@ href="{{ include.link }}" class="badge badge-{{ include.color | default: "info" }}" {% if include.tooltip %} data-toggle="tooltip" - data-original-title="{{ include.tooltip }}"> {{ include.text }} -{% else %}> {{ include.text }}{% endif %} + data-original-title="{{ include.tooltip }}"> {{ include.text }} +{% else %}> {{ include.text }}{% endif %} {% else %} {{include.text}} + > {{include.text}} {% else %} - > {% if include.icon %}{% endif %} {{include.text}} + > {% if include.icon %}{% endif %} {{include.text}} {% endif %} {% endif %} diff --git a/_includes/breadcrumbs.html b/_includes/breadcrumbs.html index b744bb53..01f198db 100644 --- a/_includes/breadcrumbs.html +++ b/_includes/breadcrumbs.html @@ -2,7 +2,7 @@ {% assign crumbs = page.url | remove:'/index.html' | split: '/' %}
              1. - Home + Home
                2. {% for crumb in crumbs offset: 1 %} {% if forloop.last %} diff --git a/_includes/card.html b/_includes/card.html index 9a294a60..4dbc1303 100644 --- a/_includes/card.html +++ b/_includes/card.html @@ -16,7 +16,7 @@ {% assign color = label_data[0] %} {% assign text = label_data[1] %} {% assign tooltip = label_data[2] | default: "" %} - {% assign help_icon = '' %} + {% assign help_icon = '' %} {{text}} {{ help_icon }} {% else %} @@ -30,7 +30,7 @@ {% if include.image %} {{include.title}} {% elsif include.icon %} - + {% elsif include.font %} {% endif %} diff --git a/_includes/cardv2.html b/_includes/cardv2.html index 8982b84b..1a52770c 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -9,7 +9,7 @@ {% assign color = badge_data[0] %} {% assign text = badge_data[1] %} {% assign tooltip = badge_data[2] | default: false %} - {% assign help_icon = '' %} + {% assign help_icon = '' %} - + Website {% if include.privacy-policy %} @@ -86,7 +86,7 @@ href="{{include.privacy-policy}}" rel="noopener" class="btn btn-warning mt-1 mr-1"> - + Privacy Policy {% endif %} @@ -95,7 +95,7 @@ href="{{include.forum}}" rel="noopener" class="btn btn-success mt-1 mr-1"> - + Forum {% endif %} @@ -127,170 +127,170 @@ {% if include.windows %} {% if include.windows != "" %} - + {% else %} - + {% endif %} {% endif %} {% if include.mac %} {% if include.mac != "" %} - + {% else %} - + {% endif %} {% endif %} {% if include.linux %} {% if include.linux != "" %} - + {% else %} - + {% endif %} {% 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 %} @@ -300,25 +300,25 @@ {% 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 38ea9d03..4f1481f1 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -7,36 +7,36 @@
                diff --git a/_includes/sections/android-addons.html b/_includes/sections/android-addons.html index 9220156f..35ef8c35 100644 --- a/_includes/sections/android-addons.html +++ b/_includes/sections/android-addons.html @@ -1,4 +1,4 @@ -

                Android Privacy Add-ons

                +

                Android Privacy Add-ons

                diff --git a/_includes/sections/android-operating-systems.html b/_includes/sections/android-operating-systems.html index 6825a1bf..22a1a14e 100644 --- a/_includes/sections/android-operating-systems.html +++ b/_includes/sections/android-operating-systems.html @@ -1,6 +1,6 @@ -

                Mobile Operating Systems

                +

                Mobile Operating Systems

                -

                Android-based Operating Systems

                +

                Android-based Operating Systems

            -

            Browser Recommendations For iOS

            +

            Browser Recommendations For iOS

            {% include cardv2.html title="Firefox" diff --git a/_includes/sections/browser-tweaks.html b/_includes/sections/browser-tweaks.html index 9b69d737..f664abe0 100644 --- a/_includes/sections/browser-tweaks.html +++ b/_includes/sections/browser-tweaks.html @@ -1,4 +1,4 @@ -

            Firefox: Privacy Related "about:config" Tweaks

            +

            Firefox: Privacy Related "about:config" Tweaks

            diff --git a/_includes/sections/browser-webrtc.html b/_includes/sections/browser-webrtc.html index 3b2fc636..fecf30dc 100644 --- a/_includes/sections/browser-webrtc.html +++ b/_includes/sections/browser-webrtc.html @@ -1,10 +1,10 @@ -

            WebRTC IP Leak Test - Is your IP address leaking?

            +

            WebRTC IP Leak Test - Is your IP address leaking?

            -

            While software like NoScript prevents this, it's probably a good idea to block this protocol directly as well, just to be safe. Note: This disables browser-based call functionality that is used for webapps like Discord, Hangouts, Jitsi, etc.

            +

            While software like NoScript prevents this, it's probably a good idea to block this protocol directly as well, just to be safe. Note: This disables browser-based call functionality that is used for webapps like Discord, Hangouts, Jitsi, etc.

            Test your Browser now @@ -55,4 +55,4 @@

            What about other browsers?

            -

            Chrome on macOS and Internet Explorer do not implement WebRTC yet. But we recommend using Firefox on all devices.

            +

            Chrome on macOS and Internet Explorer do not implement WebRTC yet. But we recommend using Firefox on all devices.

            diff --git a/_includes/sections/calendar-contacts-sync.html b/_includes/sections/calendar-contacts-sync.html index 71940410..786bde3b 100644 --- a/_includes/sections/calendar-contacts-sync.html +++ b/_includes/sections/calendar-contacts-sync.html @@ -1,4 +1,4 @@ -

            Calendar and Contacts Sync

            +

            Calendar and Contacts Sync

          - + Peer to Peer (P2P)

          diff --git a/_includes/sections/ios-addons.html b/_includes/sections/ios-addons.html index 6e9da956..a374bf60 100644 --- a/_includes/sections/ios-addons.html +++ b/_includes/sections/ios-addons.html @@ -1,4 +1,4 @@ -

          iOS Privacy Add-ons

          +

          iOS Privacy Add-ons

          diff --git a/_includes/sections/key-disclosure-law.html b/_includes/sections/key-disclosure-law.html index c51e857f..06397ca5 100644 --- a/_includes/sections/key-disclosure-law.html +++ b/_includes/sections/key-disclosure-law.html @@ -1,4 +1,4 @@ -

          Key Disclosure Law

          +

          Key Disclosure Law

          Who is required to hand over the encryption keys to authorities?

          diff --git a/_includes/sections/notebooks.html b/_includes/sections/notebooks.html index 09fbafee..f3defe32 100644 --- a/_includes/sections/notebooks.html +++ b/_includes/sections/notebooks.html @@ -1,4 +1,4 @@ -

          Digital Notebook

          +

          Digital Notebook

        -

        Quotes

        +

        Quotes

        Ultimately, saying that you don't care about privacy because you have nothing to hide is no different from saying you don't care about freedom of speech because you have nothing to say. Or that you don't care about freedom of the press because you don't like to read. Or that you don't care about freedom of religion because you don't believe in God. Or that you don't care about the freedom to peacably assemble because you're a lazy, antisocial agoraphobe.

        diff --git a/_includes/sections/resources.html b/_includes/sections/resources.html index 66e6c395..734886f1 100644 --- a/_includes/sections/resources.html +++ b/_includes/sections/resources.html @@ -1,6 +1,6 @@

        Privacy Tools

        -

        Prefer the classic site? View a single-page layout.

        +

        Prefer the classic site? View a single-page layout.

        diff --git a/_includes/sections/router-firmware.html b/_includes/sections/router-firmware.html index c9d36cf6..79bd024a 100644 --- a/_includes/sections/router-firmware.html +++ b/_includes/sections/router-firmware.html @@ -1,4 +1,4 @@ -

        Open Source Router Firmware

        +

        Open Source Router Firmware

        {% include cardv2.html title="OpenWrt" diff --git a/_includes/sections/search-engines.html b/_includes/sections/search-engines.html index dc2d5c4b..a21592dd 100644 --- a/_includes/sections/search-engines.html +++ b/_includes/sections/search-engines.html @@ -1,4 +1,4 @@ -

        Privacy Respecting Search Engines

        +

        Privacy Respecting Search Engines

      -

      Related Email Articles

      +

      Related Email Articles

        diff --git a/pages/providers/vpn.html b/pages/providers/vpn.html index 3cb1d8aa..d8de6dee 100644 --- a/pages/providers/vpn.html +++ b/pages/providers/vpn.html @@ -7,7 +7,7 @@ breadcrumb: "VPN" ---
        -
        Warning
        +
        Warning

        Using a VPN will not keep your browsing habits anonymous, nor will it add additional security to non-secure (HTTP) traffic.

        If you are looking for anonymity, you should use the Tor Browser instead of a VPN.

        @@ -22,7 +22,7 @@ breadcrumb: "VPN" {% include sections/vpn.html %}
        -

        Our VPN Provider Criteria

        +

        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.

        @@ -166,7 +166,7 @@ breadcrumb: "VPN"
        -

        Further Information and Dangers

        +

        Further Information and Dangers

        diff --git a/pages/services/services.html b/pages/services/services.html index fe374139..5fb99fc8 100644 --- a/pages/services/services.html +++ b/pages/services/services.html @@ -9,13 +9,13 @@ description: "The PrivacyTools team is proud to introduce a suite of privacy-cen
        @@ -23,7 +23,7 @@ description: "The PrivacyTools team is proud to introduce a suite of privacy-cen
        diff --git a/pages/software/real-time-communication.html b/pages/software/real-time-communication.html index 69285c20..16f4dfe2 100644 --- a/pages/software/real-time-communication.html +++ b/pages/software/real-time-communication.html @@ -9,7 +9,7 @@ description: "Discover secure and private ways to communicate with others online

        - + Recent news about breaking E2EE on centralized instant messengers

        diff --git a/pages/sponsors.html b/pages/sponsors.html index 081c0dd4..efef487a 100644 --- a/pages/sponsors.html +++ b/pages/sponsors.html @@ -49,19 +49,19 @@ permalink: /sponsors/
        General Information

        This website receives well over 250,000 pageviews on a monthly basis and is highly ranked for privacy-related keywords. In addition to the benefits below your contribution will be featured on our OpenCollective page and we will thank you via social media for your contribution.

        Please note that this page is updated manually, and while we're generally on top of things, please don't hesitate to reach out to sponsors@privacytools.io if you think we've missed something :)

        -
        Backers - $10–$24
        +
        Backers - $10–$24
        • Your name added to the list of sponsors on this page.
        -
        Highlighted Backers - $25–$99
        +
        Highlighted Backers - $25–$99
        • Your name in bold at the top of our general sponsors list.
        -
        Advocates - $100–$249
        +
        Advocates - $100–$249
        • Your square logo, name, and link above the general sponsors list.
        -
        Organizations - $250+
        +
        Organizations - $250+
        • Your medium-sized logo as a prominent link on our homepage and at the very top of our sponsors page.
        -- 2.47.2 From f681b9ece67dbd1151f2d8aa7bf7f854550a2c27 Mon Sep 17 00:00:00 2001 From: "J. C" <73438877+1hiking@users.noreply.github.com> Date: Sun, 2 May 2021 08:15:54 -0500 Subject: [PATCH 3/6] Replacing more b and i for em and strong --- 404.html | 2 +- README.md | 2 +- _includes/footer.html | 6 +- _includes/sections/android-addons.html | 4 +- .../sections/android-operating-systems.html | 2 +- _includes/sections/browser-addons.html | 26 +++---- _includes/sections/browser-fingerprint.html | 2 +- _includes/sections/browser-tweaks.html | 2 +- _includes/sections/browser-webrtc.html | 2 +- .../sections/calendar-contacts-sync.html | 6 +- _includes/sections/cloud-storage.html | 4 +- _includes/sections/decentralized-video.html | 2 +- _includes/sections/dns.html | 8 +- _includes/sections/email-providers.html | 28 +++---- _includes/sections/email-warning.html | 2 +- _includes/sections/file-encryption.html | 8 +- _includes/sections/file-sync.html | 2 +- _includes/sections/instant-messenger.html | 4 +- _includes/sections/ios-addons.html | 4 +- _includes/sections/key-disclosure-law.html | 2 +- _includes/sections/notebooks.html | 2 +- _includes/sections/operating-systems.html | 4 +- _includes/sections/participate.html | 2 +- _includes/sections/password-managers.html | 8 +- _includes/sections/privacy-resources.html | 44 +++++------ _includes/sections/productivity-tools.html | 10 +-- _includes/sections/quotes.html | 2 +- _includes/sections/search-engines.html | 2 +- .../sections/self-contained-networks.html | 4 +- _includes/sections/selfhosted-cloud.html | 4 +- _includes/sections/social-networks.html | 2 +- .../sections/social-news-aggregator.html | 2 +- _includes/sections/teamchat.html | 2 +- _includes/sections/tor-operating-systems.html | 2 +- _includes/sections/video-frontends.html | 2 +- _includes/sections/voice-video-messenger.html | 2 +- _includes/sections/vpn.html | 14 ++-- _includes/sections/windows10.html | 12 +-- _includes/sponsors/silver.html | 8 +- pages/about/about.html | 6 +- pages/donate.html | 74 +++++++++---------- pages/providers/email.html | 34 ++++----- pages/providers/vpn.html | 56 +++++++------- pages/services/chat.html | 12 +-- pages/services/services.html | 6 +- pages/sponsors.html | 16 ++-- 46 files changed, 225 insertions(+), 225 deletions(-) diff --git a/404.html b/404.html index 12351996..bf23a26f 100644 --- a/404.html +++ b/404.html @@ -5,7 +5,7 @@ active_page: 404

        404

        -

        We couldn't find that :(

        +

        We couldn't find that :(

        Maybe you were looking for one of these pages?

        diff --git a/README.md b/README.md index 78faf259..cacbb5bf 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ PrivacyTools

        - Encryption Against Global Mass Surveillance. + Encryption Against Global Mass Surveillance.

        diff --git a/_includes/footer.html b/_includes/footer.html index 238637bf..4f1481f1 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -79,11 +79,11 @@ JavaScript Licenses

        - No Ads, No Google Analytics, No Affiliates, No Cross-Site Requests. - {{ site.name }} is a socially motivated website that provides information for protecting your data security and privacy. Never trust any company with your privacy, always encrypt. + No Ads, No Google Analytics, No Affiliates, No Cross-Site Requests. + {{ site.name }} is a socially motivated website that provides information for protecting your data security and privacy. Never trust any company with your privacy, always encrypt.

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

        diff --git a/_includes/sections/android-addons.html b/_includes/sections/android-addons.html index 0ff2bc30..35ef8c35 100644 --- a/_includes/sections/android-addons.html +++ b/_includes/sections/android-addons.html @@ -8,7 +8,7 @@

        Control your traffic with NetGuard

        -

        NetGuard provides simple and advanced methods to block certain apps from accessing the internet, without requiring root privileges. Applications and addresses can be individually allowed or denied access to your Wi-Fi and/or mobile connections, allowing you to control exactly which apps are able to phone home or not.

        +

        NetGuard provides simple and advanced methods to block certain apps from accessing the internet, without requiring root privileges. Applications and addresses can be individually allowed or denied access to your Wi-Fi and/or mobile connections, allowing you to control exactly which apps are able to phone home or not.

        @@ -18,7 +18,7 @@

        Tor for Android with Orbot

        -

        Orbot is a free proxy app that empowers other apps to use the internet more securely. Orbot uses Tor to encrypt your Internet traffic and then hides it by bouncing through a series of computers around the world.

        +

        Orbot is a free proxy app that empowers other apps to use the internet more securely. Orbot uses Tor to encrypt your Internet traffic and then hides it by bouncing through a series of computers around the world.

        diff --git a/_includes/sections/android-operating-systems.html b/_includes/sections/android-operating-systems.html index 30de1b31..22a1a14e 100644 --- a/_includes/sections/android-operating-systems.html +++ b/_includes/sections/android-operating-systems.html @@ -3,7 +3,7 @@

        Android-based Operating Systems

        {% include cardv2.html diff --git a/_includes/sections/browser-addons.html b/_includes/sections/browser-addons.html index abf8be47..bcc02c19 100644 --- a/_includes/sections/browser-addons.html +++ b/_includes/sections/browser-addons.html @@ -7,7 +7,7 @@ {% include cardv2.html title="uBlock Origin: Block Ads and Trackers" image="/assets/img/svg/3rd-party/ublock_origin.svg" - description="

        uBlock Origin is an efficient wide-spectrum blocker that is easy on memory, and yet can load and enforce thousands more filters than other popular blockers out there. It has no monetization strategy and is completely open source. Advanced mode allows for dynamic filtering. Dynamic filtering allows for extended blocking similar to NoScript and uMatrix (E.g. medium or hard) blocking.

        " + description="

        uBlock Origin is an efficient wide-spectrum blocker that is easy on memory, and yet can load and enforce thousands more filters than other popular blockers out there. It has no monetization strategy and is completely open source. Advanced mode allows for dynamic filtering. Dynamic filtering allows for extended blocking similar to NoScript and uMatrix (E.g. medium or hard) blocking.

        " website="https://addons.mozilla.org/firefox/addon/ublock-origin/" privacy-policy="https://github.com/gorhill/uBlock/wiki/Privacy-policy" forum="https://forum.privacytools.io/t/discussion-ublock-origin/266" @@ -21,7 +21,7 @@ {% include cardv2.html title="HTTPS Everywhere: Secure Connections" image="/assets/img/svg/3rd-party/https_everywhere.svg" - description="HTTPS Everywhere enables encryption of your connections to many major websites, making your browsing more secure. It is a collaboration between The Tor Project and the Electronic Frontier Foundation." + description="HTTPS Everywhere enables encryption of your connections to many major websites, making your browsing more secure. It is a collaboration between The Tor Project and the Electronic Frontier Foundation." website="https://www.eff.org/https-everywhere" privacy-policy="https://www.eff.org/code/privacy/policy" forum="https://forum.privacytools.io/t/discussion-https-everywhere/268" @@ -34,7 +34,7 @@ {% include cardv2.html title="Decentraleyes: Block Content Delivery Networks" image="/assets/img/svg/3rd-party/decentraleyes.svg" - description="Decentraleyes emulates Content Delivery Networks locally by intercepting requests, finding the required resource, and injecting it into the environment. This all happens instantaneously, automatically, and no prior configuration is required." + description="Decentraleyes emulates Content Delivery Networks locally by intercepting requests, finding the required resource, and injecting it into the environment. This all happens instantaneously, automatically, and no prior configuration is required." website="https://decentraleyes.org/" privacy-policy="https://decentraleyes.org/privacy-policy/" forum="https://forum.privacytools.io/t/discussion-decentraleyes/269" @@ -47,7 +47,7 @@ {% include cardv2.html title="ClearURLs" image="/assets/img/svg/3rd-party/clearurls.svg" - description="ClearURLs will automatically remove tracking elements from URLs to help protect your privacy when browsing through the Internet." + description="ClearURLs will automatically remove tracking elements from URLs to help protect your privacy when browsing through the Internet." website="https://gitlab.com/KevinRoebert/ClearUrls" privacy-policy="https://gitlab.com/KevinRoebert/ClearUrls/-/blob/master/PRIVACY.md" forum="https://forum.privacytools.io/t/discussion-clearurls/3353" @@ -60,7 +60,7 @@ {% include cardv2.html title="xBrowserSync" image="/assets/img/svg/3rd-party/xbrowsersync.svg" - description='xBrowserSync synchronizes bookmarks across devices and browsers with end-to-end encryption. Data is encrypted and decrypted on the device, no one but you can read it. No registration is needed, just enter a randomly generated id or QR code on all devices. Different servers are available, and it can also be self-hosted.' + description='xBrowserSync synchronizes bookmarks across devices and browsers with end-to-end encryption. Data is encrypted and decrypted on the device, no one but you can read it. No registration is needed, just enter a randomly generated id or QR code on all devices. Different servers are available, and it can also be self-hosted.' website="https://www.xbrowsersync.org/" privacy-policy="https://www.xbrowsersync.org/privacypolicy" github="https://github.com/xbrowsersync" @@ -84,7 +84,7 @@ {% include cardv2.html title="Terms of Service; Didn’t Read: Be Informed" image="/assets/img/svg/3rd-party/terms_of_service_didnt_read.svg" - description='Terms of Service; Didn’t Read is an addon that believes "I have read and agree to the Terms of Service" is the biggest lie on the web, and wants to fix it by grading websites based on their terms of service agreements and privacy policies. It also gives short summaries of those agreements. The analysis and ratings are published transparently by a community of reviewers.' + description='Terms of Service; Didn’t Read is an addon that believes "I have read and agree to the Terms of Service" is the biggest lie on the web, and wants to fix it by grading websites based on their terms of service agreements and privacy policies. It also gives short summaries of those agreements. The analysis and ratings are published transparently by a community of reviewers.' website="https://tosdr.org/" privacy-policy="https://addons.mozilla.org/firefox/addon/terms-of-service-didnt-read/privacy/" forum="https://forum.privacytools.io/t/discussion-terms-of-service-didn-t-read/270" @@ -98,7 +98,7 @@ title="Snowflake" image="/assets/img/svg/3rd-party/snowflake.svg" <<<<<<< HEAD - description="Snowflake is a new pluggable transport from the Tor Project. If you have an uncensored connection, running this extension volunteers your connection to be used as a Snowflake proxy to help users unable to connect to the Tor network. Your IP will not be visible to the sites users visit using your proxy, as this extension will not make you an exit node. If your access to the Tor network is blocked, this extension will not assist you, and you should use the Tor Browser instead. Note: This add-on does not work with WebRTC disabled." + description="Snowflake is a new pluggable transport from the Tor Project. If you have an uncensored connection, running this extension volunteers your connection to be used as a Snowflake proxy to help users unable to connect to the Tor network. Your IP will not be visible to the sites users visit using your proxy, as this extension will not make you an exit node. If your access to the Tor network is blocked, this extension will not assist you, and you should use the Tor Browser instead. Note: This add-on does not work with WebRTC disabled." ======= description="Snowflake is a new pluggable transport from the Tor Project. If you have an uncensored connection, running this extension volunteers your connection to be used as a Snowflake proxy to help users unable to connect to the Tor network. Your IP will not be visible to the sites users visit using your proxy, as this extension will not make you an exit node. If your access to the Tor network is blocked, this extension will not assist you, and you should use the Tor Browser instead. Note: This add-on does not work with WebRTC disabled." >>>>>>> fix @@ -121,7 +121,7 @@ title="Temporary Containers" image="/assets/img/svg/3rd-party/temporary_containers.svg" image-dark="/assets/img/svg/3rd-party/temporary_containers-dark.svg" - description="Temporary Containers allow you to open tabs, websites, and links in automatically managed disposable containers. Containers isolate data websites store (cookies, storage, and more) from each other, enhancing your privacy and security while you browse: Enhance your privacy in Firefox with Temporary Containers." + description="Temporary Containers allow you to open tabs, websites, and links in automatically managed disposable containers. Containers isolate data websites store (cookies, storage, and more) from each other, enhancing your privacy and security while you browse: Enhance your privacy in Firefox with Temporary Containers." website="https://addons.mozilla.org/firefox/addon/temporary-containers/" privacy-policy="https://addons.mozilla.org/firefox/addon/temporary-containers/privacy/" forum="https://forum.privacytools.io/t/discussion-temporary-containers-multi-account-containers/3354" @@ -132,7 +132,7 @@ {% include cardv2.html title="Firefox Multi-Account Containers" image="/assets/img/svg/3rd-party/firefox_multi_account_containers.svg" - description="Firefox Multi-Account Containers allow you to create containers for specific websites. These containers are isolated from eachother. This add-on can be used in conjunctiuon with Temporary Containers to allow persistent logins to websites you specify." + description="Firefox Multi-Account Containers allow you to create containers for specific websites. These containers are isolated from eachother. This add-on can be used in conjunctiuon with Temporary Containers to allow persistent logins to websites you specify." website="https://support.mozilla.org/kb/containers" forum="https://forum.privacytools.io/t/discussion-temporary-containers-multi-account-containers/3354" github="https://github.com/mozilla/multi-account-containers" @@ -148,7 +148,7 @@ {% include cardv2.html title="ETag Stoppa" image="/assets/img/svg/3rd-party/etag_stoppa.svg" - description="ETag Stoppa Prevents Firefox from storing entity tags by removing ETag response headers unconditionally and without exceptions." + description="ETag Stoppa Prevents Firefox from storing entity tags by removing ETag response headers unconditionally and without exceptions." website="https://addons.mozilla.org/firefox/addon/etag-stoppa/" forum="" github="https://github.com/claustromaniac/etag-stoppa" @@ -158,7 +158,7 @@ {% include cardv2.html title="Cookie AutoDelete: Automatically Delete Cookies" image="/assets/img/png/3rd-party/cookie_autodelete.png" - description="Cookie AutoDelete automatically removes cookies, lingering sessions, and other information that can be used to spy on you when they are no longer used by open browser tabs." + description="Cookie AutoDelete automatically removes cookies, lingering sessions, and other information that can be used to spy on you when they are no longer used by open browser tabs." website="https://addons.mozilla.org/firefox/addon/cookie-autodelete/" forum="https://forum.privacytools.io/t/discussion-cookie-autodelete/267" github="https://github.com/Cookie-AutoDelete/Cookie-AutoDelete" @@ -175,7 +175,7 @@ {% include cardv2.html title="uMatrix: Stop Cross-Site Requests" image="/assets/img/png/3rd-party/umatrix.png" - description="uMatrix gives you control over the requests that websites make to other websites. Many websites integrate features which let other websites track you, such as Facebook Like Buttons or Google Analytics. uMatrix allows 1st party scripts in its default configuration. If you want the default functionality of NoScript consider blocking 1st party scripts everywhere by default. This addon has been discontinued." + description="uMatrix gives you control over the requests that websites make to other websites. Many websites integrate features which let other websites track you, such as Facebook Like Buttons or Google Analytics. uMatrix allows 1st party scripts in its default configuration. If you want the default functionality of NoScript consider blocking 1st party scripts everywhere by default. This addon has been discontinued." website="https://addons.mozilla.org/firefox/addon/umatrix/" privacy-policy="https://github.com/gorhill/uMatrix/wiki/Privacy-policy" forum="https://forum.privacytools.io/t/discussion-umatrix/271" @@ -188,7 +188,7 @@ {% include cardv2.html title="CanvasBlocker" image="/assets/img/svg/3rd-party/canvasblocker.svg" - description="CanvasBlocker allows users to prevent websites from using some Javascript APIs to fingerprint them. Users can choose to block the APIs entirely on some or all websites (which may break some websites) or just block or fake its fingerprinting-friendly readout API." + description="CanvasBlocker allows users to prevent websites from using some Javascript APIs to fingerprint them. Users can choose to block the APIs entirely on some or all websites (which may break some websites) or just block or fake its fingerprinting-friendly readout API." website="https://github.com/kkapsner/CanvasBlocker/" privacy-policy="https://addons.mozilla.org/firefox/addon/canvasblocker/privacy/" forum="https://forum.privacytools.io/t/discussion-canvasblocker/3352" diff --git a/_includes/sections/browser-fingerprint.html b/_includes/sections/browser-fingerprint.html index 16d570a8..bc551547 100644 --- a/_includes/sections/browser-fingerprint.html +++ b/_includes/sections/browser-fingerprint.html @@ -12,7 +12,7 @@

        -

        You need to find what most browsers are reporting, and then use those variables to bring your browser in the same population. This means having the same fonts, plugins, and extensions installed as the large installed base. You should have a spoofed user-agent string to match what the large userbase has. You need to have the same settings enabled and disabled, such as DNT and WebGL. You need your browser to look as common as everyone else. Disabling JavaScript, using Linux, or even using the Tor Browser Bundle, will make your browser stick out from the masses.

        +

        You need to find what most browsers are reporting, and then use those variables to bring your browser in the same population. This means having the same fonts, plugins, and extensions installed as the large installed base. You should have a spoofed user-agent string to match what the large userbase has. You need to have the same settings enabled and disabled, such as DNT and WebGL. You need your browser to look as common as everyone else. Disabling JavaScript, using Linux, or even using the Tor Browser Bundle, will make your browser stick out from the masses.

        Modern web browsers have not been architected to assure personal web privacy. Rather than worrying about being fingerprinted, it seems more practical to use free software plugins to regain control. They not only respect your freedom, but your privacy also. You can get much further with these than trying to manipulate your browser's fingerprint.

        diff --git a/_includes/sections/browser-tweaks.html b/_includes/sections/browser-tweaks.html index 1410c325..f664abe0 100644 --- a/_includes/sections/browser-tweaks.html +++ b/_includes/sections/browser-tweaks.html @@ -1,6 +1,6 @@

        Firefox: Privacy Related "about:config" Tweaks

        - +

        Preparation:

        diff --git a/_includes/sections/browser-webrtc.html b/_includes/sections/browser-webrtc.html index 9a488518..fecf30dc 100644 --- a/_includes/sections/browser-webrtc.html +++ b/_includes/sections/browser-webrtc.html @@ -13,7 +13,7 @@

        How to disable WebRTC in Firefox?

        In short: Set "media.peerconnection.enabled" to "false" in "about:config".

        -

        Explained:

        +

        Explained:

        1. Enter "about:config" in the firefox address bar and press enter.
          2. diff --git a/_includes/sections/calendar-contacts-sync.html b/_includes/sections/calendar-contacts-sync.html index b6004d3d..786bde3b 100644 --- a/_includes/sections/calendar-contacts-sync.html +++ b/_includes/sections/calendar-contacts-sync.html @@ -1,14 +1,14 @@

          Calendar and Contacts Sync

          {% include cardv2.html title="Nextcloud" image="/assets/img/svg/3rd-party/nextcloud.svg" - 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/" privacy-policy="https://nextcloud.com/privacy/" forum="https://forum.privacytools.io/t/discussion-nextcloud-calender-contacts-sync-tools/1535" @@ -27,7 +27,7 @@ include cardv2.html title="EteSync" image="/assets/img/svg/3rd-party/etesync.svg" - description="EteSync is a secure, end-to-end encrypted, and privacy-respecting cloud backup and synchronization software for your personal information (e.g. contacts and calendars). There are native clients for Android, iOS, and the web, and an adapter layer for most desktop clients. It costs $24 per year to use, or you can host the server yourself for free." + description="EteSync is a secure, end-to-end encrypted, and privacy-respecting cloud backup and synchronization software for your personal information (e.g. contacts and calendars). There are native clients for Android, iOS, and the web, and an adapter layer for most desktop clients. It costs $24 per year to use, or you can host the server yourself for free." website="https://www.etesync.com/" privacy-policy="https://www.etesync.com/tos/#privacy" forum="https://forum.privacytools.io/t/discussion-etesync-calender-contacts-sync-tools/1536" diff --git a/_includes/sections/cloud-storage.html b/_includes/sections/cloud-storage.html index 33e7a002..d876fd42 100644 --- a/_includes/sections/cloud-storage.html +++ b/_includes/sections/cloud-storage.html @@ -1,13 +1,13 @@

          Encrypted Cloud Storage Services

          {% include cardv2.html title="Nextcloud - Choose your hoster" image="/assets/img/svg/3rd-party/nextcloud.svg" - description="Nextcloud is a suite of free and open-source client-server software for creating your own file hosting services on a private server you control. The only limits on storage and bandwidth are the limits on the server provider you choose." + description="Nextcloud is a suite of free and open-source client-server software for creating your own file hosting services on a private server you control. The only limits on storage and bandwidth are the limits on the server provider you choose." website="https://nextcloud.com/" privacy-policy="https://nextcloud.com/privacy/" forum="https://forum.privacytools.io/t/discussion-nextcloud/287" diff --git a/_includes/sections/decentralized-video.html b/_includes/sections/decentralized-video.html index 30301dc0..db2a1ab0 100644 --- a/_includes/sections/decentralized-video.html +++ b/_includes/sections/decentralized-video.html @@ -1,7 +1,7 @@

          Decentralized Video Platforms

          {% include cardv2.html diff --git a/_includes/sections/dns.html b/_includes/sections/dns.html index b984ddfc..7131623b 100644 --- a/_includes/sections/dns.html +++ b/_includes/sections/dns.html @@ -632,13 +632,13 @@ We also log how many times this or that tracker has been blocked. We need this i

          - In iOS, iPadOS, tvOS 14 and macOS 11, DoT and DoH were introduced. DoT and DoH are supported natively by installation of profiles (through mobileconfig files opened in Safari). - After installation, the encrypted DNS server can be selected in Settings → General → VPN and Network → DNS. + In iOS, iPadOS, tvOS 14 and macOS 11, DoT and DoH were introduced. DoT and DoH are supported natively by installation of profiles (through mobileconfig files opened in Safari). + After installation, the encrypted DNS server can be selected in Settings → General → VPN and Network → DNS.

          diff --git a/_includes/sections/email-providers.html b/_includes/sections/email-providers.html index e56f0927..af12dc0c 100644 --- a/_includes/sections/email-providers.html +++ b/_includes/sections/email-providers.html @@ -1,7 +1,7 @@

          Recommended Email Services

          @@ -17,14 +17,14 @@
          <<<<<<< HEAD -

          ProtonMail {% include badge.html color="info" text="Free" %}

          -

          ProtonMail.com is an email service with a focus on privacy, encryption, security, and ease of use. They have been in operation since 2013. ProtonMail is based in Genève, Switzerland. Accounts start with 500 MB storage with their free plan.

          +

          ProtonMail {% include badge.html color="info" text="Free" %}

          +

          ProtonMail.com is an email service with a focus on privacy, encryption, security, and ease of use. They have been in operation since 2013. ProtonMail is based in Genève, Switzerland. Accounts start with 500 MB storage with their free plan.

          =======

          ProtonMail {% include badge.html color="info" text="Free" %}

          ProtonMail.com is an email service with a focus on privacy, encryption, security, and ease of use. They have been in operation since 2013. ProtonMail is based in Genève, Switzerland. Accounts start with 500 MB storage with their free plan.

          >>>>>>> fix -

          Free accounts have some limitations and do not allow the use of the ProtonMail Bridge, which is required to use a recommended email client (e.g. Thunderbird) or to search email by body text. Paid accounts are available starting at €48/y which include features like ProtonMail Bridge, additional storage, custom domain support, and more. The webmail and mobile apps can only search To:, From:, Date: and Subject: (this is likely to change when v4.0 of ProtonMail is released).

          +

          Free accounts have some limitations and do not allow the use of the ProtonMail Bridge, which is required to use a recommended email client (e.g. Thunderbird) or to search email by body text. Paid accounts are available starting at €48/y which include features like ProtonMail Bridge, additional storage, custom domain support, and more. The webmail and mobile apps can only search To:, From:, Date: and Subject: (this is likely to change when v4.0 of ProtonMail is released).

          {% include badge.html color="success" text="Domains and Aliases" %}

          Paid ProtonMail users can use their own domain with the service. Catch-all addresses are supported with custom domains for Professional and Visionary plans. ProtonMail also supports subaddressing, which is useful for users who don't want to purchase a domain.

          @@ -60,8 +60,8 @@
          <<<<<<< HEAD -

          Mailbox.org {% include badge.html color="info" text="€12/y" %}

          -

          Mailbox.org is an email service with a focus on being secure, ad-free, and privately powered by 100% eco-friendly energy. They have been in operation since 2014. Mailbox.org is based in Berlin, Germany. Accounts start with 2 GB of storage, which can be upgraded as needed.

          +

          Mailbox.org {% include badge.html color="info" text="€12/y" %}

          +

          Mailbox.org is an email service with a focus on being secure, ad-free, and privately powered by 100% eco-friendly energy. They have been in operation since 2014. Mailbox.org is based in Berlin, Germany. Accounts start with 2 GB of storage, which can be upgraded as needed.

          =======

          Mailbox.org {% include badge.html color="info" text="€12/y" %}

          Mailbox.org is an email service with a focus on being secure, ad-free, and privately powered by 100% eco-friendly energy. They have been in operation since 2014. Mailbox.org is based in Berlin, Germany. Accounts start with 2 GB of storage, which can be upgraded as needed.

          @@ -102,8 +102,8 @@
          <<<<<<< HEAD -

          Posteo {% include badge.html color="info" text="€12/y" %}

          -

          Posteo.de is an email provider that focuses on anonymous, secure, and private email. Their servers are powered by 100% sustainable energy. They have been in operation since 2009. Posteo is based in Germany and has a free 14-day trial. Posteo comes with 2 GB for the monthly cost and an extra gigabyte can be purchased for €0.25 per month.

          +

          Posteo {% include badge.html color="info" text="€12/y" %}

          +

          Posteo.de is an email provider that focuses on anonymous, secure, and private email. Their servers are powered by 100% sustainable energy. They have been in operation since 2009. Posteo is based in Germany and has a free 14-day trial. Posteo comes with 2 GB for the monthly cost and an extra gigabyte can be purchased for €0.25 per month.

          =======

          Posteo {% include badge.html color="info" text="€12/y" %}

          Posteo.de is an email provider that focuses on anonymous, secure, and private email. Their servers are powered by 100% sustainable energy. They have been in operation since 2009. Posteo is based in Germany and has a free 14-day trial. Posteo comes with 2 GB for the monthly cost and an extra gigabyte can be purchased for €0.25 per month.

          @@ -144,8 +144,8 @@
          <<<<<<< HEAD -

          Disroot {% include badge.html color="info" text="Free" %}

          -

          Disroot offers email amongst other services. The service is maintained by volunteers and its community. They have been in operation since 2015. Disroot is based in Amsterdam. Disroot is free and uses open source software such as Rainloop to provide service. Users support the service through donations and buying extra storage. The mailbox limit is 1 GB, but extra storage can be purchased 0.15€ per GB per month paid yearly.

          +

          Disroot {% include badge.html color="info" text="Free" %}

          +

          Disroot offers email amongst other services. The service is maintained by volunteers and its community. They have been in operation since 2015. Disroot is based in Amsterdam. Disroot is free and uses open source software such as Rainloop to provide service. Users support the service through donations and buying extra storage. The mailbox limit is 1 GB, but extra storage can be purchased 0.15€ per GB per month paid yearly.

          =======

          Disroot {% include badge.html color="info" text="Free" %}

          Disroot offers email amongst other services. The service is maintained by volunteers and its community. They have been in operation since 2015. Disroot is based in Amsterdam. Disroot is free and uses open source software such as Rainloop to provide service. Users support the service through donations and buying extra storage. The mailbox limit is 1 GB, but extra storage can be purchased 0.15€ per GB per month paid yearly.

          @@ -186,8 +186,8 @@
          <<<<<<< HEAD -

          Tutanota {% include badge.html color="info" text="Free" %}

          -

          Tutanota.com is an email service with a focus on security and privacy through the use of encryption. Tutanota has been in operation since 2011 and is based in Hanover, Germany. Accounts start with 1GB storage with their free plan.

          +

          Tutanota {% include badge.html color="info" text="Free" %}

          +

          Tutanota.com is an email service with a focus on security and privacy through the use of encryption. Tutanota has been in operation since 2011 and is based in Hanover, Germany. Accounts start with 1GB storage with their free plan.

          =======

          Tutanota {% include badge.html color="info" text="Free" %}

          Tutanota.com is an email service with a focus on security and privacy through the use of encryption. Tutanota has been in operation since 2011 and is based in Hanover, Germany. Accounts start with 1GB storage with their free plan.

          @@ -233,8 +233,8 @@
          <<<<<<< HEAD -

          StartMail {% include badge.html color="info" text="Personal USD $59.95/y" %}

          -

          StartMail.com is an email service with a focus on security and privacy through the use of standard OpenPGP encryption. StartMail has been in operation since 2014 and is based in Boulevard 11, Zeist Netherlands. Accounts start with 10GB. They offer a 30-day trial.

          +

          StartMail {% include badge.html color="info" text="Personal USD $59.95/y" %}

          +

          StartMail.com is an email service with a focus on security and privacy through the use of standard OpenPGP encryption. StartMail has been in operation since 2014 and is based in Boulevard 11, Zeist Netherlands. Accounts start with 10GB. They offer a 30-day trial.

          =======

          StartMail {% include badge.html color="info" text="Personal USD $59.95/y" %}

          StartMail.com is an email service with a focus on security and privacy through the use of standard OpenPGP encryption. StartMail has been in operation since 2014 and is based in Boulevard 11, Zeist Netherlands. Accounts start with 10GB. They offer a 30-day trial.

          diff --git a/_includes/sections/email-warning.html b/_includes/sections/email-warning.html index 453b1288..cdc1e56c 100644 --- a/_includes/sections/email-warning.html +++ b/_includes/sections/email-warning.html @@ -3,7 +3,7 @@
          Warning

          When using end-to-end encryption (E2EE) technology like OpenPGP, email will still have some metadata that is not encrypted in the header of the email. Read more about email metadata.

          -

          OpenPGP also does not support Forward secrecy, which means if either your or the recipient's private key is ever stolen, all previous messages encrypted with it will be exposed. How do I protect my private keys?

          +

          OpenPGP also does not support Forward secrecy, which means if either your or the recipient's private key is ever stolen, all previous messages encrypted with it will be exposed. How do I protect my private keys?

          Rather than use email for prolonged conversations, consider using a medium that does support Forward secrecy.

          Recommended Instant Messengers
          diff --git a/_includes/sections/file-encryption.html b/_includes/sections/file-encryption.html index ee0d9b49..b358e44c 100644 --- a/_includes/sections/file-encryption.html +++ b/_includes/sections/file-encryption.html @@ -1,7 +1,7 @@

          File Encryption Software

          {% @@ -9,7 +9,7 @@ title="VeraCrypt - Disk Encryption" image="/assets/img/svg/3rd-party/veracrypt.svg" image-dark="/assets/img/svg/3rd-party/veracrypt-dark.svg" - 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/" @@ -22,7 +22,7 @@ include cardv2.html title="GNU Privacy Guard - Email Encryption" image="/assets/img/svg/3rd-party/gnupg.svg" - 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." + 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/" privacy-policy="https://gnupg.org/privacy-policy.html" forum="https://forum.privacytools.io/t/discussion-gnupg-file-encryption/1533" @@ -41,7 +41,7 @@ include cardv2.html title="7 Zip" image="/assets/img/svg/3rd-party/7zip.svg" - description='7-Zip is a free and open-source file archiver, a utility used to place groups of files within compressed containers. On Linux, MacOS etc. the command-line tool p7zip is used and integrates into various interfaces such as FileRoller, Xarchiver, Ark.' + description='7-Zip is a free and open-source file archiver, a utility used to place groups of files within compressed containers. On Linux, MacOS etc. the command-line tool p7zip is used and integrates into various interfaces such as FileRoller, Xarchiver, Ark.' website="https://7-zip.org" forum="https://forum.privacytools.io/t/discussion-7-zip/3024" source="https://sourceforge.net/projects/sevenzip/files/" diff --git a/_includes/sections/file-sync.html b/_includes/sections/file-sync.html index 2526aed9..44a000fc 100644 --- a/_includes/sections/file-sync.html +++ b/_includes/sections/file-sync.html @@ -9,7 +9,7 @@ include cardv2.html title="Syncthing" image="/assets/img/svg/3rd-party/syncthing.svg" - description="Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third-party, and how it is transmitted over the Internet." + description="Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third-party, and how it is transmitted over the Internet." website="https://syncthing.net/" forum="https://forum.privacytools.io/t/discussion-syncthing/1627/2" github="https://github.com/syncthing?type=source" diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html index 95bfe906..8fd05c55 100644 --- a/_includes/sections/instant-messenger.html +++ b/_includes/sections/instant-messenger.html @@ -4,9 +4,9 @@ + If you are currently using an Instant Messenger like Telegram, LINE, Viber, WhatsApp, or plain SMS, you should pick an alternative here.
          -

          We only recommend instant messenger programs or apps that support end-to-end encryption (E2EE). When E2EE is used, all transmissions (messages, voice, video, etc.) are encrypted before they are sent from your device. E2EE protects both the authenticity and confidentiality of the transmission as they pass through any part of the network (servers, etc.).

          +

          We only recommend instant messenger programs or apps that support end-to-end encryption (E2EE). When E2EE is used, all transmissions (messages, voice, video, etc.) are encrypted before they are sent from your device. E2EE protects both the authenticity and confidentiality of the transmission as they pass through any part of the network (servers, etc.).

          All the client programs/apps we chose are free and open-source software unless otherwise mentioned. This to ensure that the code can be independently verified by experts now and in the future.

          diff --git a/_includes/sections/ios-addons.html b/_includes/sections/ios-addons.html index 259ef10c..a374bf60 100644 --- a/_includes/sections/ios-addons.html +++ b/_includes/sections/ios-addons.html @@ -8,7 +8,7 @@

        Use a VPN with Passepartout

        -

        Passepartout is a free, open-source, and user friendly OpenVPN app with presets for multiple providers (including Mullvad and ProtonVPN, two PrivacyTools recommended providers) and easy configurability.

        +

        Passepartout is a free, open-source, and user friendly OpenVPN app with presets for multiple providers (including Mullvad and ProtonVPN, two PrivacyTools recommended providers) and easy configurability.

        @@ -18,7 +18,7 @@

      Block content in Safari with AdGuard for iOS

      -

      AdGuard for iOS is a free (and open-source) content-blocking app that allows you to set filters within Safari. As required by iOS, it uses the native Content Blocker API for even greater privacy.

      +

      AdGuard for iOS is a free (and open-source) content-blocking app that allows you to set filters within Safari. As required by iOS, it uses the native Content Blocker API for even greater privacy.

      diff --git a/_includes/sections/key-disclosure-law.html b/_includes/sections/key-disclosure-law.html index e4455f28..06397ca5 100644 --- a/_includes/sections/key-disclosure-law.html +++ b/_includes/sections/key-disclosure-law.html @@ -55,7 +55,7 @@
      -

      * (people who know how to access a system may be ordered to share their knowledge, however, this doesn't apply to the suspect itself or family members.)

      +

      * (people who know how to access a system may be ordered to share their knowledge, however, this doesn't apply to the suspect itself or family members.)

      Related Information

      diff --git a/_includes/sections/notebooks.html b/_includes/sections/notebooks.html index 978c43c2..f3defe32 100644 --- a/_includes/sections/notebooks.html +++ b/_includes/sections/notebooks.html @@ -1,7 +1,7 @@

      Digital Notebook

      {% include cardv2.html diff --git a/_includes/sections/operating-systems.html b/_includes/sections/operating-systems.html index e994afcc..a9358f02 100644 --- a/_includes/sections/operating-systems.html +++ b/_includes/sections/operating-systems.html @@ -1,7 +1,7 @@

      Introductory Operating Systems

      {% include cardv2.html @@ -27,7 +27,7 @@

      Advanced Operating Systems

      {% include cardv2.html diff --git a/_includes/sections/participate.html b/_includes/sections/participate.html index e3909897..6b3c7704 100644 --- a/_includes/sections/participate.html +++ b/_includes/sections/participate.html @@ -2,7 +2,7 @@

      Participate with suggestions and constructive criticism

      -

      It's important for a website like {{ site.name }} to stay up-to-date. Keep an eye on software updates for the applications listed on our site. Follow recent news about providers that we recommend. We try our best to keep up, but we're not perfect and the internet is changing fast. If you find an error, or you think a provider should not be listed here, or a qualified service provider is missing, or a browser plugin is not the best choice anymore, or anything else... Talk to us please. You can also find us on several Matrix rooms, primarily #general:privacytools.io. XMPP users can join there via #general#privacytools.io@matrix.org. When using our services, users should follow our Code of Conduct.

      +

      It's important for a website like {{ site.name }} to stay up-to-date. Keep an eye on software updates for the applications listed on our site. Follow recent news about providers that we recommend. We try our best to keep up, but we're not perfect and the internet is changing fast. If you find an error, or you think a provider should not be listed here, or a qualified service provider is missing, or a browser plugin is not the best choice anymore, or anything else... Talk to us please. You can also find us on several Matrix rooms, primarily #general:privacytools.io. XMPP users can join there via #general#privacytools.io@matrix.org. When using our services, users should follow our Code of Conduct.

      diff --git a/_includes/sections/password-managers.html b/_includes/sections/password-managers.html index 815b3910..e18914d7 100644 --- a/_includes/sections/password-managers.html +++ b/_includes/sections/password-managers.html @@ -1,14 +1,14 @@

      Password Manager Software

      {% include cardv2.html title="Bitwarden - Cloud/Self-host" image="/assets/img/svg/3rd-party/bitwarden.svg" - 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/" privacy-policy="https://bitwarden.com/privacy/" forum="https://forum.privacytools.io/t/discussion-bitwarden/1343" @@ -34,7 +34,7 @@ include cardv2.html title="KeePassXC - Local" image="/assets/img/svg/3rd-party/keepassxc.svg" - 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." + 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/" privacy-policy="https://keepassxc.org/privacy/" forum="https://forum.privacytools.io/t/discussion-keepassxc/1344/2" @@ -55,7 +55,7 @@ include cardv2.html title="LessPass - Browser" image="/assets/img/svg/3rd-party/lesspass.svg" - 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/" privacy-policy="https://addons.mozilla.org/en-US/firefox/addon/lesspass/privacy/" forum="https://forum.privacytools.io/t/discussion-keepassxc/1344/2" diff --git a/_includes/sections/privacy-resources.html b/_includes/sections/privacy-resources.html index dfd28bb8..50f90828 100644 --- a/_includes/sections/privacy-resources.html +++ b/_includes/sections/privacy-resources.html @@ -3,39 +3,39 @@

      Guides

      Information

        -
      • Freedom of the Press Foundation - Supporting and defending journalism dedicated to transparency and accountability since 2012.
        • -
      • Erfahrungen.com - German review aggregator website of privacy-related services.
        • -
      • Open Wireless Movement - a coalition of Internet freedom advocates, companies, organizations, and technologists working to develop new wireless technologies and to inspire a movement of Internet openness.
        • -
      • privacy.net - What does the US government know about you?
        • -
      • r/privacytoolsIO Wiki - Our Wiki on reddit.com.
        • -
      • Security Now! - Weekly Internet Security Podcast by Steve Gibson and Leo Laporte.
        • -
      • TechSNAP - Weekly Systems, Network, and Administration Podcast. Every week TechSNAP covers the stories that impact those of us in the tech industry.
        • -
      • Terms of Service; Didn't Read - "I have read and agree to the Terms" is the biggest lie on the web. We aim to fix that.
        • +
      • Freedom of the Press Foundation - Supporting and defending journalism dedicated to transparency and accountability since 2012.
        • +
      • Erfahrungen.com - German review aggregator website of privacy-related services.
        • +
      • Open Wireless Movement - a coalition of Internet freedom advocates, companies, organizations, and technologists working to develop new wireless technologies and to inspire a movement of Internet openness.
        • +
      • privacy.net - What does the US government know about you?
        • +
      • r/privacytoolsIO Wiki - Our Wiki on reddit.com.
        • +
      • Security Now! - Weekly Internet Security Podcast by Steve Gibson and Leo Laporte.
        • +
      • TechSNAP - Weekly Systems, Network, and Administration Podcast. Every week TechSNAP covers the stories that impact those of us in the tech industry.
        • +
      • Terms of Service; Didn't Read - "I have read and agree to the Terms" is the biggest lie on the web. We aim to fix that.

      Tools

        -
      • ipleak.net - IP/DNS Detect - What is your IP, what is your DNS, what informations you send to websites.
        • -
      • The ultimate Online Privacy Test Resource List - A collection of Internet sites that check whether your web browser leaks information.
        • -
      • PRISM Break - We all have a right to privacy, which you can exercise today by encrypting your communications and ending your reliance on proprietary services.
        • -
      • Security in-a-Box - A guide to digital security for activists and human rights defenders throughout the world.
        • -
      • SecureDrop - An open-source whistleblower submission system that media organizations can use to securely accept documents from and communicate with anonymous sources. It was originally created +
      • ipleak.net - IP/DNS Detect - What is your IP, what is your DNS, what informations you send to websites.
        • +
      • The ultimate Online Privacy Test Resource List - A collection of Internet sites that check whether your web browser leaks information.
        • +
      • PRISM Break - We all have a right to privacy, which you can exercise today by encrypting your communications and ending your reliance on proprietary services.
        • +
      • Security in-a-Box - A guide to digital security for activists and human rights defenders throughout the world.
        • +
      • SecureDrop - An open-source whistleblower submission system that media organizations can use to securely accept documents from and communicate with anonymous sources. It was originally created by the late Aaron Swartz and is currently managed by Freedom of the Press Foundation.
        • -
      • Security First - Umbrella is an Android app that provides all the advice needed to operate safely in a hostile environment.
        • -
      • 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
        • +
      • Security First - Umbrella is an Android app that provides all the advice needed to operate safely in a hostile environment.
        • +
      • 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

      Note: Just being open source does not make software secure!

      diff --git a/_includes/sections/productivity-tools.html b/_includes/sections/productivity-tools.html index 2bdd17d4..c039ef2e 100644 --- a/_includes/sections/productivity-tools.html +++ b/_includes/sections/productivity-tools.html @@ -4,7 +4,7 @@ include cardv2.html title="CryptPad" image="/assets/img/svg/3rd-party/cryptpad.svg" - 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." + 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/" privacy-policy="https://cryptpad.fr/privacy.html" forum="https://forum.privacytools.io/t/discussion-cryptpad-productivity-tools/1537" @@ -16,7 +16,7 @@ include cardv2.html title="Etherpad" image="/assets/img/svg/3rd-party/etherpad.svg" - 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." + 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" @@ -34,7 +34,7 @@ title="Write.as" image="/assets/img/svg/3rd-party/writeas.svg" image-dark="/assets/img/svg/3rd-party/writeas-dark.svg" - 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." + 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/" privacy-policy="https://write.as/privacy" forum="https://forum.privacytools.io/t/discussion-write-as-productivity-tools/1539" @@ -71,7 +71,7 @@ include cardv2.html title="MAT2" image="/assets/img/svg/3rd-party/mat2.svg" - 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." + 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" @@ -87,7 +87,7 @@ include cardv2.html title="ExifCleaner" image="/assets/img/svg/3rd-party/exifcleaner.svg" - description='ExifCleaner is a freeware, open source graphical app that uses ExifTool to remove exif metadata from images, videos, and PDF documents using a simple drag and drop interface. It supports multi-core batch processing and dark mode.' + description='ExifCleaner is a freeware, open source graphical app that uses ExifTool to remove exif metadata from images, videos, and PDF documents using a simple drag and drop interface. It supports multi-core batch processing and dark mode.' website="https://exifcleaner.com" forum="https://forum.privacytools.io/t/discussion-mat/TODOADDTHIS" github="https://github.com/szTheory/exifcleaner" diff --git a/_includes/sections/quotes.html b/_includes/sections/quotes.html index 0ab39189..66d8f24d 100644 --- a/_includes/sections/quotes.html +++ b/_includes/sections/quotes.html @@ -5,7 +5,7 @@

      Glenn Greenwald: Why privacy matters Over the last 16 months, as I've debated this issue around the world, every single time somebody has said to me, "I don't really worry about invasions of privacy because I don't have anything to hide." I always say the same thing to them. I get out a pen, I write down my email address. I say, "Here's my email address. What I want you to do when you get home is email me the passwords to all of your email accounts, not just the nice, respectable work one in your name, but all of them, because I - want to be able to just troll through what it is you're doing online, read what I want to read and publish whatever I find interesting. After all, if you're not a bad person, if you're doing nothing wrong, you should have nothing to hide." Not a single person has taken me up on that offer.

      + want to be able to just troll through what it is you're doing online, read what I want to read and publish whatever I find interesting. After all, if you're not a bad person, if you're doing nothing wrong, you should have nothing to hide." Not a single person has taken me up on that offer.

      diff --git a/_includes/sections/search-engines.html b/_includes/sections/search-engines.html index 0bc2f0eb..a21592dd 100644 --- a/_includes/sections/search-engines.html +++ b/_includes/sections/search-engines.html @@ -1,7 +1,7 @@

      Privacy Respecting Search Engines

      {% diff --git a/_includes/sections/self-contained-networks.html b/_includes/sections/self-contained-networks.html index 23c9903a..5c3a1dd3 100644 --- a/_includes/sections/self-contained-networks.html +++ b/_includes/sections/self-contained-networks.html @@ -1,7 +1,7 @@

      Self-contained Networks

      {% include cardv2.html @@ -74,7 +74,7 @@
    11. I2P-Bote - End-to-end encrypted decentralized mail system within the I2P network.
    12. GNUnet - GNUnet provides a strong foundation of free software for a global, distributed network that provides security and privacy.
    13. - IPFS and IPFS Companion- A peer-to-peer hypermedia protocol to make the web faster, safer, and more open. IPFS Companion is a browser extension for redirecting queries to a gateway of your choice (generally local). + IPFS and IPFS Companion- A peer-to-peer hypermedia protocol to make the web faster, safer, and more open. IPFS Companion is a browser extension for redirecting queries to a gateway of your choice (generally local). {% include badge.html color="warning" icon="fas fa-exclamation-triangle" diff --git a/_includes/sections/selfhosted-cloud.html b/_includes/sections/selfhosted-cloud.html index 0dd7910a..4251da5b 100644 --- a/_includes/sections/selfhosted-cloud.html +++ b/_includes/sections/selfhosted-cloud.html @@ -1,13 +1,13 @@

      Self-Hosted Cloud Server Software

      {% include cardv2.html title="Nextcloud" image="/assets/img/svg/3rd-party/nextcloud.svg" - description="Nextcloud is a suite of free and open-source client-server software for creating your own file hosting services on a private server you control. The only limits on storage and bandwidth are the limits on the server provider you choose." + description="Nextcloud is a suite of free and open-source client-server software for creating your own file hosting services on a private server you control. The only limits on storage and bandwidth are the limits on the server provider you choose." website="https://nextcloud.com/" privacy-policy="https://nextcloud.com/privacy/" forum="https://forum.privacytools.io/t/discussion-nextcloud/287" diff --git a/_includes/sections/social-networks.html b/_includes/sections/social-networks.html index 06e0def6..fec7c543 100644 --- a/_includes/sections/social-networks.html +++ b/_includes/sections/social-networks.html @@ -1,7 +1,7 @@

      Decentralized Social Networks

      {% include cardv2.html diff --git a/_includes/sections/social-news-aggregator.html b/_includes/sections/social-news-aggregator.html index 0f65166e..90c6ab48 100644 --- a/_includes/sections/social-news-aggregator.html +++ b/_includes/sections/social-news-aggregator.html @@ -1,7 +1,7 @@

      Social News Aggregators

      {% include cardv2.html diff --git a/_includes/sections/teamchat.html b/_includes/sections/teamchat.html index 7f35ce45..7de3ef27 100644 --- a/_includes/sections/teamchat.html +++ b/_includes/sections/teamchat.html @@ -5,7 +5,7 @@ {% diff --git a/_includes/sections/tor-operating-systems.html b/_includes/sections/tor-operating-systems.html index 1d0ec191..c7fd21f4 100644 --- a/_includes/sections/tor-operating-systems.html +++ b/_includes/sections/tor-operating-systems.html @@ -1,7 +1,7 @@

      Tor-Focused Distributions

      {% include cardv2.html diff --git a/_includes/sections/video-frontends.html b/_includes/sections/video-frontends.html index 8560af2b..eec3a61c 100644 --- a/_includes/sections/video-frontends.html +++ b/_includes/sections/video-frontends.html @@ -1,7 +1,7 @@

      Frontends and Proxies

      {% include cardv2.html diff --git a/_includes/sections/voice-video-messenger.html b/_includes/sections/voice-video-messenger.html index 7be5dd33..938af934 100644 --- a/_includes/sections/voice-video-messenger.html +++ b/_includes/sections/voice-video-messenger.html @@ -1,7 +1,7 @@

      Video/Voice Calling

      {% include cardv2.html diff --git a/_includes/sections/vpn.html b/_includes/sections/vpn.html index 6db11081..a4f223c1 100644 --- a/_includes/sections/vpn.html +++ b/_includes/sections/vpn.html @@ -1,7 +1,7 @@

      Recommended VPN Services

      @@ -21,7 +21,7 @@ Mullvad {% include badge.html color="info" text="EUR €60/y" %} -

      Mullvad.net is a fast and inexpensive VPN with a serious focus on transparency and security. They have been in operation since 2009. Mullvad is based in Sweden and does not have a free trial.

      +

      Mullvad.net is a fast and inexpensive VPN with a serious focus on transparency and security. They have been in operation since 2009. Mullvad is based in Sweden and does not have a free trial.

      {% include badge.html color="success" text="35 Countries" %}

      Mullvad has servers in 35 countries at the time of writing this page. Picking a VPN provider with a server nearest to you will reduce latency of the network traffic you send. This is because of a shorter route (less hops) to the destination.

      We also think it's better for the security of the VPN provider's private keys if they use dedicated servers, instead of cheaper shared solutions (with other customers) such as virtual private servers.

      @@ -34,7 +34,7 @@
      {% include badge.html color="success" text="Open Source Clients" %}

      Mullvad provides the source code for their desktop and mobile clients in their GitHub organization.

      {% include badge.html color="success" text="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.

      +

      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.

      {% include badge.html color="success" text="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.

      {% include badge.html color="success" text="IPv6 Support" %}
      @@ -58,7 +58,7 @@ {% include badge.html color="info" text="Basic USD $48/y" %} {% include badge.html color="secondary" text="Plus USD $96/y" %} -

      ProtonVPN.com 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. They offer a further 14% discount for buying a 2 year subscription.

      +

      ProtonVPN.com 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. They offer a further 14% discount for buying a 2 year subscription.

      {% include badge.html color="success" text="44 Countries" %}

      ProtonVPN has servers in 44 countries at the time of writing this page. Picking a VPN provider with a server nearest to you will reduce latency of the network traffic you send. This is because of a shorter route (less hops) to the destination.

      We also think it's better for the security of the VPN provider's private keys if they use dedicated servers, instead of cheaper shared solutions (with other customers) such as virtual private servers.

      @@ -86,7 +86,7 @@ {% include badge.html color="info" text="Standard USD $60/y" %} {% include badge.html color="secondary" text="Pro USD $100/y" %} -

      IVPN.net is another premium VPN provider, and they have been in operation since 2009. IVPN is based in Gibraltar.

      +

      IVPN.net is another premium VPN provider, and they have been in operation since 2009. IVPN is based in Gibraltar.

      {% include badge.html color="success" text="32 Countries" %}

      IVPN has servers in 32 countries at the time of writing this page. Picking a VPN provider with a server nearest to you will reduce latency of the network traffic you send. This is because of a shorter route (less hops) to the destination.

      We also think it's better for the security of the VPN provider's private keys if they use dedicated servers, instead of cheaper shared solutions (with other customers) such as virtual private servers.

      @@ -95,7 +95,7 @@
      {% include badge.html color="success" text="Open Source Clients" %}

      As of Feburary 2020 IVPN applications are now open source. Source code can be obtained from their GitHub organization.

      {% include badge.html color="success" text="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.

      +

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

      {% include badge.html color="success" text="WireGuard Support" %}

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

      {% include badge.html color="success" text="Remote Port Forwarding" %}
      @@ -109,5 +109,5 @@
      diff --git a/_includes/sections/windows10.html b/_includes/sections/windows10.html index ff626a29..b4b3a003 100644 --- a/_includes/sections/windows10.html +++ b/_includes/sections/windows10.html @@ -1,13 +1,13 @@

      Don't use Windows 10 - It's a privacy nightmare

      Windows 10 Privacy
        -
      1. Data syncing is by default enabled. +
      2. Data syncing is by default enabled.
        • Browsing history and open websites.
        • Apps settings.
          • @@ -15,13 +15,13 @@
        3. -
      3. Your device is by default tagged with a unique advertising ID. +
      4. Your device is by default tagged with a unique advertising ID.
        • Used to serve you with personalized advertisements by third-party advertisers and ad networks.
        5. -
      5. Cortana can collect any of your data. +
      6. Cortana can collect any of your data.
        • Your keystrokes, searches and mic input.
        @@ -39,7 +39,7 @@
        7. -
      7. Microsoft can collect any personal data. +
      8. Microsoft can collect any personal data.
        • Your identity.
        @@ -66,7 +66,7 @@
        9. -
      9. Your data can be shared. +
      10. Your data can be shared.
        • When downloading Windows 10, you are authorizing Microsoft to share any of above-mentioned data with any third-party, with or without your consent.
        diff --git a/_includes/sponsors/silver.html b/_includes/sponsors/silver.html index fedd52fa..55f493d5 100644 --- a/_includes/sponsors/silver.html +++ b/_includes/sponsors/silver.html @@ -2,7 +2,7 @@
        Techlore Logo
        -

        Techlore

        +

        Techlore

        https://techlore.tech
        @@ -11,7 +11,7 @@
        Awesome Resources Logo
        -

        Awesome Resources Ltd

        +

        Awesome Resources Ltd

        https://www.awesomeresources.co.uk
        @@ -20,7 +20,7 @@
        Look To The Right Logo
        -

        Look To The Right

        +

        Look To The Right

        https://looktotheright.com
        @@ -29,7 +29,7 @@
        scams.info
        -

        scams.info

        +

        scams.info

        https://www.scams.info
        diff --git a/pages/about/about.html b/pages/about/about.html index 7b53b306..ab544fd9 100644 --- a/pages/about/about.html +++ b/pages/about/about.html @@ -12,9 +12,9 @@ hidedesc: true
        -

        You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities.

        -

        At PrivacyTools, we provide services, tools, and knowledge to protect your privacy against global mass surveillance, and moderate a thriving community of privacy-minded individuals like yourself to discuss and learn about new advances in protecting your online data. serves as the centerpiece of our organization, where we research and recommend various software solutions for our community.

        -

        Transparency is our strongest value, and it's what sets us apart from the rest of the "privacy recommendations" community. Editorial changes to this website and the products we recommend are always discussed on our extensive issue tracker, drafted in a public pull request open for further discussion, and logged in a comprehensive commit log dating back to our original founding date in 2015. The core team members listed below are responsible for most of the edits and final decisions to changes on this website and across our services, but this website is truly the work of hundreds contributors and fact checkers working to make sure our recommendations are solid and trustworthy.

        +

        You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities.

        +

        At PrivacyTools, we provide services, tools, and knowledge to protect your privacy against global mass surveillance, and moderate a thriving community of privacy-minded individuals like yourself to discuss and learn about new advances in protecting your online data. serves as the centerpiece of our organization, where we research and recommend various software solutions for our community.

        +

        Transparency is our strongest value, and it's what sets us apart from the rest of the "privacy recommendations" community. Editorial changes to this website and the products we recommend are always discussed on our extensive issue tracker, drafted in a public pull request open for further discussion, and logged in a comprehensive commit log dating back to our original founding date in 2015. The core team members listed below are responsible for most of the edits and final decisions to changes on this website and across our services, but this website is truly the work of hundreds contributors and fact checkers working to make sure our recommendations are solid and trustworthy.

        Additionally, we are a not-for-profit organization. We do not utilize paid recommendations or affiliate programs to make the recommendations on this website. Unfortunately this practice is very common elsewhere online, which makes it difficult to trust other review sites. We are unique in this area, in that all of our research is conducted independently, and we will never accept payments to modify, add, or remove any of our reviews or recommendations. Our finances are provided entirely by our community donors and sponsors, and are handled by the Open Collective Foundation 501(c)(3). Because we are operating as a charity in the United States, we are legally obligated to only use our funding to further our mission of spreading privacy education and promoting online services like Mastodon, Matrix, and WriteFreely. This website is a public resource, not a profit generator. To that regard, all our financial transactions (incoming and outgoing) are logged and made available to the public via our page at opencollective.com/privacytools.

        We take the operation of our various services very seriously, and require all participants to adhere to our Code of Conduct. For any questions or to report abuse, please see our CoC’s Enforcement section.

        diff --git a/pages/donate.html b/pages/donate.html index 102738d7..34ff5bc8 100644 --- a/pages/donate.html +++ b/pages/donate.html @@ -15,7 +15,7 @@ permalink: /donate/
        Donate via OpenCollective
        -

        If you are able, please consider contributing to our development and outreach programs. Contributions via OpenCollective to {{ site.name }} are tax deductible for US taxpayers. These funds are transparently and primarily used to cover server costs.

        +

        If you are able, please consider contributing to our development and outreach programs. Contributions via OpenCollective to {{ site.name }} are tax deductible for US taxpayers. These funds are transparently and primarily used to cover server costs.

        Contribute More Info
        @@ -33,7 +33,7 @@ permalink: /donate/
        <<<<<<< HEAD - + ======= >>>>>>> fix @@ -44,7 +44,7 @@ permalink: /donate/
        <<<<<<< HEAD - + ======= >>>>>>> fix @@ -55,7 +55,7 @@ permalink: /donate/
        <<<<<<< HEAD - + ======= >>>>>>> fix @@ -66,7 +66,7 @@ permalink: /donate/
        <<<<<<< HEAD - + ======= >>>>>>> fix @@ -77,7 +77,7 @@ permalink: /donate/
        <<<<<<< HEAD - + ======= >>>>>>> fix @@ -88,7 +88,7 @@ permalink: /donate/
        <<<<<<< HEAD - + ======= >>>>>>> fix @@ -99,7 +99,7 @@ permalink: /donate/
        <<<<<<< HEAD - + ======= >>>>>>> fix @@ -124,203 +124,203 @@ permalink: /donate/
        - +
        - +
        - +
        - +
        - +
        - +
        - +
        - +
        - +
        - +
        - +
        - +
        - +
        - +
        - +
        - +
        - +
        - +
        - +
        - +
        - +
        - +
        - +
        - +
        - +
        - +
        - +
        - +
        - +
        diff --git a/pages/providers/email.html b/pages/providers/email.html index 9ba69de6..d3e5809c 100644 --- a/pages/providers/email.html +++ b/pages/providers/email.html @@ -12,7 +12,7 @@ description: "Find a secure email provider that will keep your privacy in mind.

        Our Email 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 Email provider wishing to be recommended, including implementing industry best practices, modern technology and more. We suggest you familiarize yourself with this list before choosing an Email provider, and conduct your own research to ensure the Email provider you choose is the right choice for you.

        +

        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 Email provider wishing to be recommended, including implementing industry best practices, modern technology and more. We suggest you familiarize yourself with this list before choosing an Email provider, and conduct your own research to ensure the Email provider you choose is the right choice for you.

        @@ -21,13 +21,13 @@ description: "Find a secure email provider that will keep your privacy in mind.

        Operating outside the five/nine/fourteen-eyes countries is not necessarily a guarantee of privacy, 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:

        +

        Minimum to Qualify:

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

        Best Case:

        +

        Best Case:

        • Operating outside the USA or other Fourteen Eyes countries.
        • Operating inside a country with strong consumer protection laws.
          • @@ -39,14 +39,14 @@ description: "Find a secure email provider that will keep your privacy in mind.

          We regard these features as important in order to provide a safe and optimal service to users. Users should consider the provider which has the features they require.

        -

        Minimum to Qualify:

        +

        Minimum to Qualify:

        • Encrypts account data at rest.
        • Integrated webmail encryption provides convenience to users who want improve on having no E2EE encryption.
        -

        Best Case:

        +

        Best Case:

        • Encrypts account data at rest with zero-access encryption.
        • Allow users to use their own domain name. Custom domain names are important to users because it allows them to maintain their agency from the service, should it turn bad, be acquired by another company which doesn't prioritize privacy etc.
          • @@ -64,7 +64,7 @@ description: "Find a secure email provider that will keep your privacy in mind.

          We prefer our recommended providers to collect as little data as possible.

        -

        Minimum to Qualify:

        +

        Minimum to Qualify:

        • Protect sender's IP address. Filter it from showing in the Received header field.
        • Don't require personally identifiable information (PII) besides username and password.
          • @@ -72,7 +72,7 @@ description: "Find a secure email provider that will keep your privacy in mind.
        -

        Best Case:

        +

        Best Case:

        • Accepts Bitcoin, cash, and other forms of cryptocurrency and/or anonymous payment options (gift cards, etc.)
        @@ -83,7 +83,7 @@ description: "Find a secure email provider that will keep your privacy in mind.

        Email servers deal with a lot of very sensitive data. We expect that providers will adopt best industry practices in order to protect their users.

        -

        Minimum to Qualify:

        +

        Minimum to Qualify:

        • Protection of webmail with two-factor authentication (2FA), such as TOTP.
        • Encryption at rest, (e.g. dm-crypt) this protects the contents of the servers in case of unlawful seizure.
          • @@ -102,7 +102,7 @@ description: "Find a secure email provider that will keep your privacy in mind.
        -

        Best Case:

        +

        Best Case:

        • Support for hardware authentication, ie U2F and WebAuthn. U2F and WebAuthn are more secure as they use a private key stored on a client-side hardware device to authenticate users, as opposed to a shared secret that is stored on the web server and on the client side when using TOTP. Furthermore, U2F and WebAuthn are more resistant to phishing as their authentication response is based on the authenticated domain name.
        • Zero access encryption, builds on encryption at rest. The difference being the provider does not have the decryption keys to the data they hold. This prevents a rogue employee leaking data they have access to or remote adversary from releasing data they have stolen by gaining unauthorized access to the server.
          • @@ -122,13 +122,13 @@ description: "Find a secure email provider that will keep your privacy in mind.

          You wouldn't trust your finances to someone with a fake identity, so why trust them with your email? 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:

        +

        Minimum to Qualify:

        • Public-facing leadership or ownership.
        -

        Best Case:

        +

        Best Case:

        • Public-facing leadership.
        • Frequent transparency reports.
          • @@ -140,7 +140,7 @@ description: "Find a secure email provider that will keep your privacy in mind.

          With the email providers we recommend we like to see responsible marketing.

        -

        Minimum to Qualify:

        +

        Minimum to Qualify:

        • Must self host analytics (no Google Analytics etc). The provider's site must also comply with DNT (Do Not Track) for those users who want to opt-out.
        @@ -155,7 +155,7 @@ description: "Find a secure email provider that will keep your privacy in mind.
        -

        Best Case:

        +

        Best Case:

        • Clear and easy to read documentation. This includes things like, setting up 2FA, email clients, OpenPGP, etc.
        @@ -223,14 +223,14 @@ description: "Find a secure email provider that will keep your privacy in mind. alt="AnonAddy">
        -

        AnonAddy lets users create aliases that forward to their email address. Can be self-hosted. Source code on GitHub.

        +

        AnonAddy lets users create aliases that forward to their email address. Can be self-hosted. Source code on GitHub.

        SimpleLogin
        -

        SimpleLogin allows you to easily create aliases for your email. Can be self-hosted. Source code on GitHub.

        +

        SimpleLogin allows you to easily create aliases for your email. Can be self-hosted. Source code on GitHub.

        Self-hosting Email

        @@ -243,13 +243,13 @@ description: "Find a secure email provider that will keep your privacy in mind. alt="Mail-in-a-Box">
        -

        Mail-in-a-Box is an automated setup script for deploying a mail server on Ubuntu. Its goal is to make it easier for users to set up their own mail server.

        +

        Mail-in-a-Box is an automated setup script for deploying a mail server on Ubuntu. Its goal is to make it easier for users to set up their own mail server.

        Mailcow -

        Mailcow is a more advanced mail server perfect for those with a bit more Linux experience. It has everything you need in a Docker container: A mailserver with DKIM support, antivirus and spam monitoring, webmail and ActiveSync with SOGo, and web-based administration with 2FA support. Mailcow Dockerized docs

        +

        Mailcow is a more advanced mail server perfect for those with a bit more Linux experience. It has everything you need in a Docker container: A mailserver with DKIM support, antivirus and spam monitoring, webmail and ActiveSync with SOGo, and web-based administration with 2FA support. Mailcow Dockerized docs

        For a more manual approach we've picked out these two articles.

          diff --git a/pages/providers/vpn.html b/pages/providers/vpn.html index 0a887e4a..d8de6dee 100644 --- a/pages/providers/vpn.html +++ b/pages/providers/vpn.html @@ -9,10 +9,10 @@ breadcrumb: "VPN"
          Warning
          -

          Using a VPN will not keep your browsing habits anonymous, nor will it add additional security to non-secure (HTTP) traffic.

          -

          If you are looking for anonymity, you should use the Tor Browser instead of a VPN.

          -

          If you're looking for added security, you should always ensure you're connecting to websites using encrypted DNS and HTTPS. A VPN is not a replacement for good security practices.

          -

          If you're looking for additional privacy from your ISP, on a public Wi-Fi network, or while torrenting files, a VPN may be the solution for you as long as you understand the risks involved.

          +

          Using a VPN will not keep your browsing habits anonymous, nor will it add additional security to non-secure (HTTP) traffic.

          +

          If you are looking for anonymity, you should use the Tor Browser instead of a VPN.

          +

          If you're looking for added security, you should always ensure you're connecting to websites using encrypted DNS and HTTPS. A VPN is not a replacement for good security practices.

          +

          If you're looking for additional privacy from your ISP, on a public Wi-Fi network, or while torrenting files, a VPN may be the solution for you as long as you understand the risks involved.

          Download Tor Tor Myths & FAQ More Info @@ -24,7 +24,7 @@ breadcrumb: "VPN"

          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.

          +

          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.

          @@ -33,13 +33,13 @@ breadcrumb: "VPN"

          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:

          +

          Minimum to Qualify:

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

          Best Case:

          +

          Best Case:

          • Operating outside the USA or other Fourteen Eyes countries.
          • Operating inside a country with strong consumer protection laws.
            • @@ -48,10 +48,10 @@ breadcrumb: "VPN"

            {% include badge.html color="info" text="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 killswitch to block network data leaks when disconnected.

            +

            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 killswitch to block network data leaks when disconnected.

            -

            Minimum to Qualify:

            +

            Minimum to Qualify:

            • OpenVPN support.
            • Killswitch built in to clients.
              • @@ -59,7 +59,7 @@ breadcrumb: "VPN"
            -

            Best Case:

            +

            Best Case:

            • OpenVPN and WireGuard support.
            • Killswitch with highly configurable options (enable/disable on certain networks, on boot, etc.)
              • @@ -74,14 +74,14 @@ breadcrumb: "VPN"

              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:

            +

            Minimum to Qualify:

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

            Best Case:

            +

            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.)
              • @@ -93,7 +93,7 @@ breadcrumb: "VPN"

              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:

            +

            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).
              • @@ -101,7 +101,7 @@ breadcrumb: "VPN"
            -

            Best Case:

            +

            Best Case:

            • Strongest Encryption: RSA-4096.
            • Perfect Forward Secrecy (PFS).
              • @@ -115,13 +115,13 @@ breadcrumb: "VPN"

              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:

            +

            Minimum to Qualify:

            • Public-facing leadership or ownership.
            -

            Best Case:

            +

            Best Case:

            • Public-facing leadership.
            • Frequent transparency reports.
              • @@ -133,7 +133,7 @@ breadcrumb: "VPN"

              With the VPN providers we recommend we like to see responsible marketing.

            -

            Minimum to Qualify:

            +

            Minimum to Qualify:

            • Must self host analytics (no Google Analytics etc). The provider's site must also comply with DNT (Do Not Track) for those users who want to opt-out.
            @@ -150,7 +150,7 @@ breadcrumb: "VPN"
          -

          Best Case:

          +

          Best Case:

          Responsible marketing that is both educational and useful to the consumer could include:

          • A accurate comparison to when Tor or other Self contained networks should be used.
            • @@ -172,35 +172,35 @@ breadcrumb: "VPN"

            Should I use a VPN?

            -

            The answer to this question is not a particularly helpful one: It depends. It depends on what you're expecting a VPN to do for you, who you're trying to hide your traffic from, and what applications you're using.

            -

            In most cases, VPNs do little to protect your privacy or enhance your security, unless paired with other changes.

            +

            The answer to this question is not a particularly helpful one: It depends. It depends on what you're expecting a VPN to do for you, who you're trying to hide your traffic from, and what applications you're using.

            +

            In most cases, VPNs do little to protect your privacy or enhance your security, unless paired with other changes.

            VPNs cannot encrypt data outside of the connection between your device and the VPN server. VPN providers can see and modify your traffic the same way your ISP could. And there is no way to verify a VPN provider's "no logging" policies in any way.

            What if I need encryption?

            -

            In most cases, most of your traffic is already encrypted! Over 98% of the top 3000 websites offer HTTPS, meaning your non-DNS traffic is safe regardless of using a VPN. It is incredibly rare for applications that handle personal data to not support HTTPS in 2019, especially with services like Let's Encrypt offering free HTTPS certificates to any website operator.

            +

            In most cases, most of your traffic is already encrypted! Over 98% of the top 3000 websites offer HTTPS, meaning your non-DNS traffic is safe regardless of using a VPN. It is incredibly rare for applications that handle personal data to not support HTTPS in 2019, especially with services like Let's Encrypt offering free HTTPS certificates to any website operator.

            Even if a site you visit doesn't support HTTPS, a VPN will not protect you, because a VPN cannot magically encrypt the traffic between the VPN's servers and the website's servers. Installing an extension like HTTPS Everywhere and making sure every site you visit uses HTTPS is far more helpful than using a VPN.

            Should I use encrypted DNS with a VPN?

            -

            The answer to this question is also not very helpful: it depends. Your VPN provider may have their own DNS servers, but if they don't, the traffic between your VPN provider and the DNS server isn't encrypted. You need to trust the encrypted DNS provider in addition to the VPN provider and unless your client and target server support encrypted SNI, the VPN provider can still see which domains you are visiting.

            -

            However you shouldn't use encrypted DNS with Tor. This would direct all of your DNS requests through a single circuit, and would allow the encrypted DNS provider to deanonymize you.

            +

            The answer to this question is also not very helpful: it depends. Your VPN provider may have their own DNS servers, but if they don't, the traffic between your VPN provider and the DNS server isn't encrypted. You need to trust the encrypted DNS provider in addition to the VPN provider and unless your client and target server support encrypted SNI, the VPN provider can still see which domains you are visiting.

            +

            However you shouldn't use encrypted DNS with Tor. This would direct all of your DNS requests through a single circuit, and would allow the encrypted DNS provider to deanonymize you.

            What if I need anonymity?

            VPNs cannot provide strong anonymity. Your VPN provider will still see your real IP address, and often has a money trail that can be linked directly back to you. You cannot rely on "no logging" policies to protect your data.

            Shouldn't I hide my IP address?

            -

            The idea that your IP address is sensitive information, or that your location is given away with all your internet traffic is fearmongering on the part of VPN providers and their marketing. Your IP address is an insignificant amount of personal data tracking companies use to identify you, because many users' IP addresses change very frequently (Dynamic IP addresses, switching networks, switching devices, etc.). Your IP address also does not give away more than the very generalized location of your Internet Service Provider. It does not give away your home address, for example, despite common perception.

            -

            Should I use Tor and a VPN?

            +

            The idea that your IP address is sensitive information, or that your location is given away with all your internet traffic is fearmongering on the part of VPN providers and their marketing. Your IP address is an insignificant amount of personal data tracking companies use to identify you, because many users' IP addresses change very frequently (Dynamic IP addresses, switching networks, switching devices, etc.). Your IP address also does not give away more than the very generalized location of your Internet Service Provider. It does not give away your home address, for example, despite common perception.

            +

            Should I use Tor and a VPN?

            By using a VPN with Tor, you're creating essentially a permanent entry node, often with a money trail attached. This provides 0 additional benefit to you, while increasing the attack surface of your connection dramatically. If you wish to hide your Tor usage from your ISP or your government, Tor has a built-in solution for that: Tor bridges. Read more about Tor bridges and why using a VPN is not necessary.

            Are VPNs ever useful?

            A VPN may still be useful to you in a variety of scenarios, such as:

              -
            1. Hiding your traffic from only your Internet Service Provider.
              2. +
            2. Hiding your traffic from only your Internet Service Provider.
            3. Hiding your downloads (such as torrents) from your ISP and anti-piracy organizations.
            -

            For use cases like these, or if you have another compelling reason, the VPN providers we listed above are who we think are the most trustworthy. However, using a VPN provider still means you're trusting the provider. In pretty much any other scenario you should be using a secure-by-design tool such as Tor.

            +

            For use cases like these, or if you have another compelling reason, the VPN providers we listed above are who we think are the most trustworthy. However, using a VPN provider still means you're trusting the provider. In pretty much any other scenario you should be using a secure-by-design tool such as Tor.

            -

            Sources and Further Reading: +

            Sources and Further Reading:

            1. VPN - a Very Precarious Narrative by Dennis Schubert
            2. Don't use VPN services by Sven Slootweg
              3. diff --git a/pages/services/chat.html b/pages/services/chat.html index 911e1333..56aaa20d 100644 --- a/pages/services/chat.html +++ b/pages/services/chat.html @@ -19,7 +19,7 @@ description: "chat.privacytools.io is our official Matrix homeserver. You can re

            Connection Information

            -

            To register on or connect to our homeserver, simply use https://chat.privacytools.io as the homeserver in your Matrix client.

            +

            To register on or connect to our homeserver, simply use https://chat.privacytools.io as the homeserver in your Matrix client.

            You must read and accept our community code of conduct before joining our rooms or using our services.

            {% @@ -41,14 +41,14 @@ description: "chat.privacytools.io is our official Matrix homeserver. You can re web="https://app.element.io" %} -

            If you're asked to enter a custom homeserver URL in a Matrix client, enter https://chat.privacytools.io, not privacytools.io or element.privacytools.io. You do not need to change your identity server, in fact https://vector.im is the only functional one, by design.

            +

            If you're asked to enter a custom homeserver URL in a Matrix client, enter https://chat.privacytools.io, not privacytools.io or element.privacytools.io. You do not need to change your identity server, in fact https://vector.im is the only functional one, by design.

            These details will be autofilled for you in most clients if you enter your full username (e.g. @alice:privacytools.io rather than alice) into the username field. In general it is preferable to do that rather than trying to remember what the homeserver URL is.

            Frequently Asked Questions

            Is #general:privacytools.io or #privacy:privacytools.io chat end-to-end encrypted?

            -

            No. Messages sent to the #general chat are encrypted from with client-to-server encryption, i.e. HTTPS. This means that your messages can't be viewed by an attacker on your network, or your ISP, etc. However, because this is a public chat room anybody can view your messages if they are a member, and newcomers will be able to see all message history. Do not say anything in rooms that don't use End-to-End (E2E) encryption that you wouldn't want tied to you personally.

            +

            No. Messages sent to the #general chat are encrypted from with client-to-server encryption, i.e. HTTPS. This means that your messages can't be viewed by an attacker on your network, or your ISP, etc. However, because this is a public chat room anybody can view your messages if they are a member, and newcomers will be able to see all message history. Do not say anything in rooms that don't use End-to-End (E2E) encryption that you wouldn't want tied to you personally.

            Isn't Matrix behind Cloudflare?

            The default matrix.org homeserver is behind Cloudflare. The PrivacyTools homeserver is not. @@ -56,7 +56,7 @@ description: "chat.privacytools.io is our official Matrix homeserver. You can re

            Isn't Matrix slow?

            It can be, for some! Due to the trememdous amount of people registering on the matrix.org homeserver, it is often overloaded and occasionally slow to respond. Therefore, users on that homeserver occasionally report a less than ideal chat experience. If that's you, you can fix this problem by switching to another homeserver. Good alternatives include...

              -
            • ours of course, at chat.privacytools.io, you're here right?
              • +
            • ours of course, at chat.privacytools.io, you're here right?
            • feneas.org, tchncs.de, weho.st, pine64.org, kde.org, halogen.city...
            • purchasing an instance from Element Matrix Services
            • running your own by installing Synapse — certainly the best option for the technically inclined!
              • @@ -78,10 +78,10 @@ description: "chat.privacytools.io is our official Matrix homeserver. You can re
              • #dev:privacytools.io: Discussions relating to building www.privacytools.io.
              • #forum:privacytools.io: All PrivacyTools Forum updates (Automated).
                • -
              • #general:privacytools.io: Main discussion room.
                • +
              • #general:privacytools.io: Main discussion room.
              • #github:privacytools.io: GitHub updates for @privacytools (Automated).
              • #guides:privacytools.io: Privacy Guides development work.
                • -
              • #privacy:privacytools.io: On-topic privacy, security, opsec discussion and support.
                • +
              • #privacy:privacytools.io: On-topic privacy, security, opsec discussion and support.
              • #wiki:privacytools.io: Wiki-building discussion room.

              If you're looking for more things to chat about, check out these rooms as well:

              diff --git a/pages/services/services.html b/pages/services/services.html index e54633ae..5fb99fc8 100644 --- a/pages/services/services.html +++ b/pages/services/services.html @@ -19,7 +19,7 @@ description: "The PrivacyTools team is proud to introduce a suite of privacy-cen
            -

            More services are on the way. If there's something that would be super beneficial for us to run, don't hesitate to reach out and ask. And of course, if you like our services, please consider donating to support our server costs, any donation helps!

            +

            More services are on the way. If there's something that would be super beneficial for us to run, don't hesitate to reach out and ask. And of course, if you like our services, please consider donating to support our server costs, any donation helps!

              @@ -30,8 +30,8 @@ description: "The PrivacyTools team is proud to introduce a suite of privacy-cen

              A brief note

              We are providing these services because we believe in decentralized and federated networks, and free and open source software. The tools we host are a great and convenient entry-point to these services like Matrix, Mastodon, and WriteFreely. We hope that we are able to spur the adoption of these alternative networks, and we strongly believe all of our services are far better than traditional providers, such as Twitter, Facebook, and Google.

              -

              However, as with any hosted, online service, remember that using our services involves risks that may or may not be acceptable to you. Using online services requires trust in the service provider. We don't know of any surefire way to evaluate a provider for privacy, or provide a service that we can guarantee is operating in a privacy-respecting way. Of course we strive to provide the best services possible for our community, but at the end of the day this involves you trusting us and the system administrators that host our services.

              -

              As always, never trust a service provider with sensitive information, even if they are trustworthy.

              +

              However, as with any hosted, online service, remember that using our services involves risks that may or may not be acceptable to you. Using online services requires trust in the service provider. We don't know of any surefire way to evaluate a provider for privacy, or provide a service that we can guarantee is operating in a privacy-respecting way. Of course we strive to provide the best services possible for our community, but at the end of the day this involves you trusting us and the system administrators that host our services.

              +

              As always, never trust a service provider with sensitive information, even if they are trustworthy.

              We also recommend you don't centralize all your online activity around a single provider's services (such as ours). This is because it is not a good idea to give a single party control over everything you do online.

              We highly recommend hosting your own services whenever possible. Not only is it a fantastic learning experience, but it allows you to have services entirely in your control. There are a number of great resources available, including...

                diff --git a/pages/sponsors.html b/pages/sponsors.html index 7af56d11..67b68b49 100644 --- a/pages/sponsors.html +++ b/pages/sponsors.html @@ -8,13 +8,13 @@ permalink: /sponsors/

                Sponsors of {{ site.name }}

                -

                A massive thank you to the following organization-level sponsors of {{ site.name }}, who pledge $250+:

                +

                A massive thank you to the following organization-level sponsors of {{ site.name }}, who pledge $250+:

                {% include sponsors/gold.html %}
                -

                The {{ site.name }} website and services are a community project. There is no advertising, affiliate links, or other forms of monetization.
                Your donations here directly support hosting this website and compensating contributors to this project.

                +

                The {{ site.name }} website and services are a community project. There is no advertising, affiliate links, or other forms of monetization.
                Your donations here directly support hosting this website and compensating contributors to this project.

                Become a Sponsor Donate Directly @@ -40,17 +40,17 @@ permalink: /sponsors/

                With this exposure and sponsorship, your customers will recognize your intrinsic understanding and commitment to user privacy. Moreover, you'll directly contribute to our mission of spreading privacy-respecting tools and knowledge worldwide!

                At PrivacyTools, we believe in...

                  -
                • Privacy, of course. Privacy gives you as a user control over how your information is used and spread online. Trustworthy and secure products and services are the key to that future.
                  • -
                • Security. We believe services cannot provide privacy at all without being secure. Strong encryption is the only way to prevent malicious actors from snooping in on our communications.
                  • -
                • Freedom. The right to express your opinion online without interference or surveillance is the only way we can grow as a society, and privacy-respecting tools should foster that growth.
                  • +
                • Privacy, of course. Privacy gives you as a user control over how your information is used and spread online. Trustworthy and secure products and services are the key to that future.
                  • +
                • Security. We believe services cannot provide privacy at all without being secure. Strong encryption is the only way to prevent malicious actors from snooping in on our communications.
                  • +
                • Freedom. The right to express your opinion online without interference or surveillance is the only way we can grow as a society, and privacy-respecting tools should foster that growth.

                We reserve the right or deny all sponsors from receiving the benefits detailed below if we believe that your organization or product is not aligned with our key values. Therefore, if you are interested in sponsoring our project, please first email sponsors@privacytools.io so we may discuss further.

                As a sponsor of {{ site.name }}, your company will be widely recognized in a variety of ways, some of which we've detailed below.

                General Information

                This website receives well over 250,000 pageviews on a monthly basis and is highly ranked for privacy-related keywords. In addition to the benefits below your contribution will be featured on our OpenCollective page and we will thank you via social media for your contribution.

                <<<<<<< HEAD -

                Please note that this page is updated manually, and while we're generally on top of things, please don't hesitate to reach out to sponsors@privacytools.io if you think we've missed something :)

                -
                Backers - $10–$24
                +

                Please note that this page is updated manually, and while we're generally on top of things, please don't hesitate to reach out to sponsors@privacytools.io if you think we've missed something :)

                +
                Backers - $10–$24
                =======

                Please note that this page is updated manually, and while we're generally on top of things, please don't hesitate to reach out to sponsors@privacytools.io if you think we've missed something :)

                Backers - $10–$24
                @@ -73,7 +73,7 @@ permalink: /sponsors/
                We will not provide...

                We pride ourselves on our integrity and commitment to spreading unbiased and fact-based information regarding privacy and privacy-respecting tools. All tools we recommend throughout our website are subject to strict criteria as judged by our team and the community across our various platforms. Your sponsorship will not grant your organization any special consideration when choosing our recommendations throughout the website, a process which we make clear via our transparent ledger on OpenCollective and our public discussions on GitHub. Your sponsorship benefits are limited to those outlined above.

                Tax and Financial Information
                -

                Your contribution to {{ site.name }} will be handled by the Open Collective Foundation 501(c)(3). For US companies and taxpayers, this means your contribution is likely tax deductible, but you should consult with your accountant regarding your specific circumstances. As a non-profit, your sponsorship contribution will not be used for private profit and will only be used to cover expenses incurred by the project. All of our transactions (donations and expenses) are published transparently on OpenCollective. For the benefit of our readership, anonymous contributions will not be eligible for the sponsorship opportunities outlined above.

                +

                Your contribution to {{ site.name }} will be handled by the Open Collective Foundation 501(c)(3). For US companies and taxpayers, this means your contribution is likely tax deductible, but you should consult with your accountant regarding your specific circumstances. As a non-profit, your sponsorship contribution will not be used for private profit and will only be used to cover expenses incurred by the project. All of our transactions (donations and expenses) are published transparently on OpenCollective. For the benefit of our readership, anonymous contributions will not be eligible for the sponsorship opportunities outlined above.

                More Information

                If you are interested and have further questions, you are welcome to reach out to us directly at sponsors@privacytools.io.

                -- 2.47.2 From 54b63b8fd721daa742ee4031742f9e7eee9dfb75 Mon Sep 17 00:00:00 2001 From: "J. C" <73438877+1hiking@users.noreply.github.com> Date: Sun, 2 May 2021 08:20:59 -0500 Subject: [PATCH 4/6] Replaces
                <<<<<<< HEAD -

                ProtonMail {% include badge.html color="info" text="Free" %}

                +

                ProtonMail {% include badge.html color="info" text="Free" %}

                ProtonMail.com is an email service with a focus on privacy, encryption, security, and ease of use. They have been in operation since 2013. ProtonMail is based in Genève, Switzerland. Accounts start with 500 MB storage with their free plan.

                =======

                ProtonMail {% include badge.html color="info" text="Free" %}

                @@ -60,7 +60,7 @@
                <<<<<<< HEAD -

                Mailbox.org {% include badge.html color="info" text="€12/y" %}

                +

                Mailbox.org {% include badge.html color="info" text="€12/y" %}

                Mailbox.org is an email service with a focus on being secure, ad-free, and privately powered by 100% eco-friendly energy. They have been in operation since 2014. Mailbox.org is based in Berlin, Germany. Accounts start with 2 GB of storage, which can be upgraded as needed.

                =======

                Mailbox.org {% include badge.html color="info" text="€12/y" %}

                @@ -102,7 +102,7 @@
                <<<<<<< HEAD -

                Posteo {% include badge.html color="info" text="€12/y" %}

                +

                Posteo {% include badge.html color="info" text="€12/y" %}

                Posteo.de is an email provider that focuses on anonymous, secure, and private email. Their servers are powered by 100% sustainable energy. They have been in operation since 2009. Posteo is based in Germany and has a free 14-day trial. Posteo comes with 2 GB for the monthly cost and an extra gigabyte can be purchased for €0.25 per month.

                =======

                Posteo {% include badge.html color="info" text="€12/y" %}

                @@ -144,7 +144,7 @@
                <<<<<<< HEAD -

                Disroot {% include badge.html color="info" text="Free" %}

                +

                Disroot {% include badge.html color="info" text="Free" %}

                Disroot offers email amongst other services. The service is maintained by volunteers and its community. They have been in operation since 2015. Disroot is based in Amsterdam. Disroot is free and uses open source software such as Rainloop to provide service. Users support the service through donations and buying extra storage. The mailbox limit is 1 GB, but extra storage can be purchased 0.15€ per GB per month paid yearly.

                =======

                Disroot {% include badge.html color="info" text="Free" %}

                @@ -186,7 +186,7 @@
                <<<<<<< HEAD -

                Tutanota {% include badge.html color="info" text="Free" %}

                +

                Tutanota {% include badge.html color="info" text="Free" %}

                Tutanota.com is an email service with a focus on security and privacy through the use of encryption. Tutanota has been in operation since 2011 and is based in Hanover, Germany. Accounts start with 1GB storage with their free plan.

                =======

                Tutanota {% include badge.html color="info" text="Free" %}

                @@ -233,7 +233,7 @@
                <<<<<<< HEAD -

                StartMail {% include badge.html color="info" text="Personal USD $59.95/y" %}

                +

                StartMail {% include badge.html color="info" text="Personal USD $59.95/y" %}

                StartMail.com is an email service with a focus on security and privacy through the use of standard OpenPGP encryption. StartMail has been in operation since 2014 and is based in Boulevard 11, Zeist Netherlands. Accounts start with 10GB. They offer a 30-day trial.

                =======

                StartMail {% include badge.html color="info" text="Personal USD $59.95/y" %}

                diff --git a/pages/donate.html b/pages/donate.html index 34ff5bc8..57c46622 100644 --- a/pages/donate.html +++ b/pages/donate.html @@ -33,7 +33,7 @@ permalink: /donate/
                <<<<<<< HEAD - + ======= >>>>>>> fix @@ -44,7 +44,7 @@ permalink: /donate/
                <<<<<<< HEAD - + ======= >>>>>>> fix @@ -55,7 +55,7 @@ permalink: /donate/
                <<<<<<< HEAD - + ======= >>>>>>> fix @@ -66,7 +66,7 @@ permalink: /donate/
                <<<<<<< HEAD - + ======= >>>>>>> fix @@ -77,7 +77,7 @@ permalink: /donate/
                <<<<<<< HEAD - + ======= >>>>>>> fix @@ -88,7 +88,7 @@ permalink: /donate/
                <<<<<<< HEAD - + ======= >>>>>>> fix @@ -99,7 +99,7 @@ permalink: /donate/
                <<<<<<< HEAD - + ======= >>>>>>> fix diff --git a/pages/sponsors.html b/pages/sponsors.html index 67b68b49..329cc33d 100644 --- a/pages/sponsors.html +++ b/pages/sponsors.html @@ -50,7 +50,7 @@ permalink: /sponsors/

                This website receives well over 250,000 pageviews on a monthly basis and is highly ranked for privacy-related keywords. In addition to the benefits below your contribution will be featured on our OpenCollective page and we will thank you via social media for your contribution.

                <<<<<<< HEAD

                Please note that this page is updated manually, and while we're generally on top of things, please don't hesitate to reach out to sponsors@privacytools.io if you think we've missed something :)

                -
                Backers - $10–$24
                +
                Backers - $10–$24
                =======

                Please note that this page is updated manually, and while we're generally on top of things, please don't hesitate to reach out to sponsors@privacytools.io if you think we've missed something :)

                Backers - $10–$24
                -- 2.47.2 From 67b1f6453367882fcbe65a66b757d097d1364704 Mon Sep 17 00:00:00 2001 From: "J. C" <73438877+1hiking@users.noreply.github.com> Date: Mon, 3 May 2021 07:54:24 -0500 Subject: [PATCH 5/6] Fix merge conflicts. --- _includes/sections/browser-addons.html | 3 --- _includes/sections/email-providers.html | 18 ------------------ pages/donate.html | 21 --------------------- pages/sponsors.html | 3 --- 4 files changed, 45 deletions(-) diff --git a/_includes/sections/browser-addons.html b/_includes/sections/browser-addons.html index bcc02c19..aae498af 100644 --- a/_includes/sections/browser-addons.html +++ b/_includes/sections/browser-addons.html @@ -97,11 +97,8 @@ {% include cardv2.html title="Snowflake" image="/assets/img/svg/3rd-party/snowflake.svg" -<<<<<<< HEAD description="Snowflake is a new pluggable transport from the Tor Project. If you have an uncensored connection, running this extension volunteers your connection to be used as a Snowflake proxy to help users unable to connect to the Tor network. Your IP will not be visible to the sites users visit using your proxy, as this extension will not make you an exit node. If your access to the Tor network is blocked, this extension will not assist you, and you should use the Tor Browser instead. Note: This add-on does not work with WebRTC disabled." -======= description="Snowflake is a new pluggable transport from the Tor Project. If you have an uncensored connection, running this extension volunteers your connection to be used as a Snowflake proxy to help users unable to connect to the Tor network. Your IP will not be visible to the sites users visit using your proxy, as this extension will not make you an exit node. If your access to the Tor network is blocked, this extension will not assist you, and you should use the Tor Browser instead. Note: This add-on does not work with WebRTC disabled." ->>>>>>> fix website="https://snowflake.torproject.org" forum="https://forum.privacytools.io/t/discussion-snowflake/1146" git="https://gitweb.torproject.org/pluggable-transports/snowflake.git" diff --git a/_includes/sections/email-providers.html b/_includes/sections/email-providers.html index 0c233630..96318fa6 100644 --- a/_includes/sections/email-providers.html +++ b/_includes/sections/email-providers.html @@ -16,13 +16,10 @@ alt="ProtonMail">
                -<<<<<<< HEAD

                ProtonMail {% include badge.html color="info" text="Free" %}

                ProtonMail.com is an email service with a focus on privacy, encryption, security, and ease of use. They have been in operation since 2013. ProtonMail is based in Genève, Switzerland. Accounts start with 500 MB storage with their free plan.

                -=======

                ProtonMail {% include badge.html color="info" text="Free" %}

                ProtonMail.com is an email service with a focus on privacy, encryption, security, and ease of use. They have been in operation since 2013. ProtonMail is based in Genève, Switzerland. Accounts start with 500 MB storage with their free plan.

                ->>>>>>> fix

                Free accounts have some limitations and do not allow the use of the ProtonMail Bridge, which is required to use a recommended email client (e.g. Thunderbird) or to search email by body text. Paid accounts are available starting at €48/y which include features like ProtonMail Bridge, additional storage, custom domain support, and more. The webmail and mobile apps can only search To:, From:, Date: and Subject: (this is likely to change when v4.0 of ProtonMail is released).

                @@ -59,13 +56,10 @@ alt="Mailbox">
                -<<<<<<< HEAD

                Mailbox.org {% include badge.html color="info" text="€12/y" %}

                Mailbox.org is an email service with a focus on being secure, ad-free, and privately powered by 100% eco-friendly energy. They have been in operation since 2014. Mailbox.org is based in Berlin, Germany. Accounts start with 2 GB of storage, which can be upgraded as needed.

                -=======

                Mailbox.org {% include badge.html color="info" text="€12/y" %}

                Mailbox.org is an email service with a focus on being secure, ad-free, and privately powered by 100% eco-friendly energy. They have been in operation since 2014. Mailbox.org is based in Berlin, Germany. Accounts start with 2 GB of storage, which can be upgraded as needed.

                ->>>>>>> fix
                {% include badge.html color="success" text="Domains and Aliases" %}

                Mailbox.org lets users use their own domain and they support catch-all addresses. Mailbox.org also supports subaddressing, which is useful for users who don't want to purchase a domain.

                @@ -101,13 +95,10 @@ alt="Posteo">
                -<<<<<<< HEAD

                Posteo {% include badge.html color="info" text="€12/y" %}

                Posteo.de is an email provider that focuses on anonymous, secure, and private email. Their servers are powered by 100% sustainable energy. They have been in operation since 2009. Posteo is based in Germany and has a free 14-day trial. Posteo comes with 2 GB for the monthly cost and an extra gigabyte can be purchased for €0.25 per month.

                -=======

                Posteo {% include badge.html color="info" text="€12/y" %}

                Posteo.de is an email provider that focuses on anonymous, secure, and private email. Their servers are powered by 100% sustainable energy. They have been in operation since 2009. Posteo is based in Germany and has a free 14-day trial. Posteo comes with 2 GB for the monthly cost and an extra gigabyte can be purchased for €0.25 per month.

                ->>>>>>> fix
                {% include badge.html color="warning" text="Domains and Aliases" %}

                Posteo does not allow the use of custom domains, however users may still make use of subaddressing.

                @@ -143,13 +134,10 @@ alt="Disroot">
                -<<<<<<< HEAD

                Disroot {% include badge.html color="info" text="Free" %}

                Disroot offers email amongst other services. The service is maintained by volunteers and its community. They have been in operation since 2015. Disroot is based in Amsterdam. Disroot is free and uses open source software such as Rainloop to provide service. Users support the service through donations and buying extra storage. The mailbox limit is 1 GB, but extra storage can be purchased 0.15€ per GB per month paid yearly.

                -=======

                Disroot {% include badge.html color="info" text="Free" %}

                Disroot offers email amongst other services. The service is maintained by volunteers and its community. They have been in operation since 2015. Disroot is based in Amsterdam. Disroot is free and uses open source software such as Rainloop to provide service. Users support the service through donations and buying extra storage. The mailbox limit is 1 GB, but extra storage can be purchased 0.15€ per GB per month paid yearly.

                ->>>>>>> fix
                {% include badge.html color="success" text="Domains and Aliases" %}

                Disroot lets users use their own domain. They have aliases, however you must manually apply for them.

                @@ -185,13 +173,10 @@ alt="Tutanota">
                -<<<<<<< HEAD

                Tutanota {% include badge.html color="info" text="Free" %}

                Tutanota.com is an email service with a focus on security and privacy through the use of encryption. Tutanota has been in operation since 2011 and is based in Hanover, Germany. Accounts start with 1GB storage with their free plan.

                -=======

                Tutanota {% include badge.html color="info" text="Free" %}

                Tutanota.com is an email service with a focus on security and privacy through the use of encryption. Tutanota has been in operation since 2011 and is based in Hanover, Germany. Accounts start with 1GB storage with their free plan.

                ->>>>>>> fix

                Tutanota doesn't allow the use of third-party email clients. There are plans to allow Tutanota pull email from external email accounts using the IMAP protocol. Email import is currently not possible.

                Emails can be exported individually or by bulk selection. Tutanota does not allow for subfolders as you might expect with other email providers.

                Tutanota is working on a desktop client and they have an app available in F-Droid. They also have their app in conventional stores such as App Store on iOS and Google Play for Android.

                @@ -232,13 +217,10 @@ alt="StartMail">
                -<<<<<<< HEAD

                StartMail {% include badge.html color="info" text="Personal USD $59.95/y" %}

                StartMail.com is an email service with a focus on security and privacy through the use of standard OpenPGP encryption. StartMail has been in operation since 2014 and is based in Boulevard 11, Zeist Netherlands. Accounts start with 10GB. They offer a 30-day trial.

                -=======

                StartMail {% include badge.html color="info" text="Personal USD $59.95/y" %}

                StartMail.com is an email service with a focus on security and privacy through the use of standard OpenPGP encryption. StartMail has been in operation since 2014 and is based in Boulevard 11, Zeist Netherlands. Accounts start with 10GB. They offer a 30-day trial.

                ->>>>>>> fix
                {% include badge.html color="success" text="Domains and Aliases" %}

                Personal accounts can use Custom or Generated aliases. Business accounts can use Domain aliases.

                diff --git a/pages/donate.html b/pages/donate.html index 57c46622..756b6705 100644 --- a/pages/donate.html +++ b/pages/donate.html @@ -32,77 +32,56 @@ permalink: /donate/
                -<<<<<<< HEAD -======= ->>>>>>> fix
                -<<<<<<< HEAD -======= ->>>>>>> fix
                -<<<<<<< HEAD -======= ->>>>>>> fix
                -<<<<<<< HEAD -======= ->>>>>>> fix
                -<<<<<<< HEAD -======= ->>>>>>> fix
                -<<<<<<< HEAD -======= ->>>>>>> fix
                -<<<<<<< HEAD -======= ->>>>>>> fix
                diff --git a/pages/sponsors.html b/pages/sponsors.html index 329cc33d..5e771f50 100644 --- a/pages/sponsors.html +++ b/pages/sponsors.html @@ -48,13 +48,10 @@ permalink: /sponsors/

                As a sponsor of {{ site.name }}, your company will be widely recognized in a variety of ways, some of which we've detailed below.

                General Information

                This website receives well over 250,000 pageviews on a monthly basis and is highly ranked for privacy-related keywords. In addition to the benefits below your contribution will be featured on our OpenCollective page and we will thank you via social media for your contribution.

                -<<<<<<< HEAD

                Please note that this page is updated manually, and while we're generally on top of things, please don't hesitate to reach out to sponsors@privacytools.io if you think we've missed something :)

                Backers - $10–$24
                -=======

                Please note that this page is updated manually, and while we're generally on top of things, please don't hesitate to reach out to sponsors@privacytools.io if you think we've missed something :)

                Backers - $10–$24
                ->>>>>>> fix
                • Your name added to the list of sponsors on this page.
                -- 2.47.2 From 7d77fdaaf484192065ca395db498acd72001adef Mon Sep 17 00:00:00 2001 From: "J. C" <73438877+1hiking@users.noreply.github.com> Date: Mon, 3 May 2021 08:08:40 -0500 Subject: [PATCH 6/6] Finish fixing merge conflicts --- _includes/sections/browser-addons.html | 1 - _includes/sections/email-providers.html | 2 -- pages/donate.html | 7 ------- pages/sponsors.html | 2 -- 4 files changed, 12 deletions(-) diff --git a/_includes/sections/browser-addons.html b/_includes/sections/browser-addons.html index aae498af..ba21f96f 100644 --- a/_includes/sections/browser-addons.html +++ b/_includes/sections/browser-addons.html @@ -98,7 +98,6 @@ title="Snowflake" image="/assets/img/svg/3rd-party/snowflake.svg" description="Snowflake is a new pluggable transport from the Tor Project. If you have an uncensored connection, running this extension volunteers your connection to be used as a Snowflake proxy to help users unable to connect to the Tor network. Your IP will not be visible to the sites users visit using your proxy, as this extension will not make you an exit node. If your access to the Tor network is blocked, this extension will not assist you, and you should use the Tor Browser instead. Note: This add-on does not work with WebRTC disabled." - description="Snowflake is a new pluggable transport from the Tor Project. If you have an uncensored connection, running this extension volunteers your connection to be used as a Snowflake proxy to help users unable to connect to the Tor network. Your IP will not be visible to the sites users visit using your proxy, as this extension will not make you an exit node. If your access to the Tor network is blocked, this extension will not assist you, and you should use the Tor Browser instead. Note: This add-on does not work with WebRTC disabled." website="https://snowflake.torproject.org" forum="https://forum.privacytools.io/t/discussion-snowflake/1146" git="https://gitweb.torproject.org/pluggable-transports/snowflake.git" diff --git a/_includes/sections/email-providers.html b/_includes/sections/email-providers.html index 96318fa6..a352f550 100644 --- a/_includes/sections/email-providers.html +++ b/_includes/sections/email-providers.html @@ -219,8 +219,6 @@

                StartMail {% include badge.html color="info" text="Personal USD $59.95/y" %}

                StartMail.com is an email service with a focus on security and privacy through the use of standard OpenPGP encryption. StartMail has been in operation since 2014 and is based in Boulevard 11, Zeist Netherlands. Accounts start with 10GB. They offer a 30-day trial.

                -

                StartMail {% include badge.html color="info" text="Personal USD $59.95/y" %}

                -

                StartMail.com is an email service with a focus on security and privacy through the use of standard OpenPGP encryption. StartMail has been in operation since 2014 and is based in Boulevard 11, Zeist Netherlands. Accounts start with 10GB. They offer a 30-day trial.

                {% include badge.html color="success" text="Domains and Aliases" %}

                Personal accounts can use Custom or Generated aliases. Business accounts can use Domain aliases.

                diff --git a/pages/donate.html b/pages/donate.html index 756b6705..7bb2f5c4 100644 --- a/pages/donate.html +++ b/pages/donate.html @@ -32,7 +32,6 @@ permalink: /donate/
                -
                @@ -40,7 +39,6 @@ permalink: /donate/
                -
                @@ -48,7 +46,6 @@ permalink: /donate/
                -
                @@ -56,7 +53,6 @@ permalink: /donate/
                -
                @@ -64,7 +60,6 @@ permalink: /donate/
                -
                @@ -72,7 +67,6 @@ permalink: /donate/
                -
                @@ -80,7 +74,6 @@ permalink: /donate/
                -
                diff --git a/pages/sponsors.html b/pages/sponsors.html index 5e771f50..efef487a 100644 --- a/pages/sponsors.html +++ b/pages/sponsors.html @@ -50,8 +50,6 @@ permalink: /sponsors/

                This website receives well over 250,000 pageviews on a monthly basis and is highly ranked for privacy-related keywords. In addition to the benefits below your contribution will be featured on our OpenCollective page and we will thank you via social media for your contribution.

                Please note that this page is updated manually, and while we're generally on top of things, please don't hesitate to reach out to sponsors@privacytools.io if you think we've missed something :)

                Backers - $10–$24
                -

                Please note that this page is updated manually, and while we're generally on top of things, please don't hesitate to reach out to sponsors@privacytools.io if you think we've missed something :)

                -
                Backers - $10–$24
                • Your name added to the list of sponsors on this page.
                -- 2.47.2