diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index e3ecf696..3bd5313b 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,2 +1,3 @@ +liberapay: privacytools.io patreon: privacytools custom: https://www.privacytools.io/donate/ diff --git a/.github/ISSUE_TEMPLATE/3_Discussion.md b/.github/ISSUE_TEMPLATE/3_Discussion.md index 506b96e2..dc53ae9e 100644 --- a/.github/ISSUE_TEMPLATE/3_Discussion.md +++ b/.github/ISSUE_TEMPLATE/3_Discussion.md @@ -1,3 +1,8 @@ + + --- name: "💬 Discussion" about: Discuss the website or any mentioned software in general. diff --git a/_includes/sections/email-providers.html b/_includes/sections/email-providers.html index 029f6939..07d1cb24 100644 --- a/_includes/sections/email-providers.html +++ b/_includes/sections/email-providers.html @@ -5,7 +5,7 @@
- + <<<<<<< HEAD
@@ -186,7 +186,191 @@ -
Email Service
+ + ======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Email ProviderWebsiteSinceJurisdictionStorageYearly PriceBitcoinEncryptionOwn Domain
+ Protonmail + + WWW + Tor + 2013 Switzerland500 MBFreeAcceptedBuilt-inYes
+ Disroot + + WWW + 2015 Netherlands2 GBFreeAcceptedBuilt-inYes
+ Tutanota + + WWW + 2011 Germany1 GBFreeNoBuilt-inYes
+ Mailfence + + WWW + 2013 Belgium500 MBFreeAcceptedBuilt-inYes
+ mailbox.org + + + WWW + 2014 Germany2 GB12 €AcceptedBuilt-inYes
+ Posteo + + WWW + 2009 Germany2 GB12 €NoBuilt-inNo
+ Runbox + + + WWW + 1999 Norway1 GB$ 19.95YesNoYes
+ Neomailbox + + WWW + 2003 Switzerland1 GB$ 49.95AcceptedBuilt-inYes
+ StartMail + + WWW + 2014 Netherlands10 GB$ 59.95AcceptedBuilt-inYes
+ Kolab Now + + WWW + 2010 Switzerland2 GB$ 60AcceptedNoYes
+ >>>>>>> origin/master

Interesting Email Providers Under Development

diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html index a3168328..bbe10b31 100644 --- a/_includes/sections/instant-messenger.html +++ b/_includes/sections/instant-messenger.html @@ -1,12 +1,15 @@

Encrypted Instant Messenger

{% include cardv2.html -title="Mobile: Signal" +title="Signal" image="/assets/img/tools/Signal.png" description="Signal is a mobile app developed by Open Whisper Systems. The app provides instant messaging, as well as voice and video calling. All communications are end-to-end encrypted. Signal is free and open source." @@ -24,7 +27,7 @@ linux="" {% include cardv2.html title="Wire" image="/assets/img/tools/wire.png" -description='A free software End-to-End Encrypted chatting application that supports instant messaging, voice, and video calls. Full source code is available. experimental (more info)' +description='A free software End-to-End Encrypted chatting application that supports instant messaging, voice, and video calls. Full source code is available. Warning' website="https://wire.com/" forum="https://forum.privacytools.io/t/discussion-wire/750" github="https://github.com/wireapp/" @@ -47,17 +50,32 @@ web=""

Worth Mentioning

diff --git a/_includes/sections/operating-systems.html b/_includes/sections/operating-systems.html index 2c7ff280..84fc93d9 100644 --- a/_includes/sections/operating-systems.html +++ b/_includes/sections/operating-systems.html @@ -41,11 +41,19 @@

Worth Mentioning

\ No newline at end of file + <<<<<<< HEAD
  • OpenBSD - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.
    • +
  • Arch Linux - A simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement. Parabola is a + completely open source version of Arch Linux.
    • +
  • Whonix contrib - A Debian GNU/Linux based security-focused Linux distribution. It aims to provide privacy, security and anonymity on the internet. The operating system consists of two virtual machines, a "Workstation" + and a Tor "Gateway". All communication are forced through the Tor network to accomplish this.
    • +
  • Subgraph OS contrib - Another Debian based Linux distribution, it features security hardening which makes it more resistant to security vulnerabilities. Subgraph runs many desktop applications in a security sandbox to limit their risk in case of compromise. + By default, it anonymizes Internet traffic by sending it through the Tor network. Note: It is still in alpha, and much testing and bug fixing still has to be done.
    • + +======= +
  • OpenBSD - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.
    • +
  • Arch Linux - A simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement. Parabola is a + completely open source version of Arch Linux.
    • +
  • Whonix contrib - A Debian GNU/Linux based security-focused Linux distribution. It aims to provide privacy, security and anonymity on the internet. The operating system consists of two virtual machines, a "Workstation" + and a Tor "Gateway". All communication are forced through the Tor network to accomplish this.
    • + +>>>>>>> origin/master \ No newline at end of file diff --git a/_includes/sections/vpn.html b/_includes/sections/vpn.html index de89be40..59e45935 100644 --- a/_includes/sections/vpn.html +++ b/_includes/sections/vpn.html @@ -6,7 +6,7 @@ {% assign eur_to_usd = 1.14 %}
    - + <<<<<<< HEAD
    @@ -267,9 +267,293 @@ + ======= +
    Sortable VPN Providers TableNo Seychelles
    + + + + + + + + + + + + + + + + + + + + + + + - -
    VPN ProviderWebsiteSinceYearly PriceFree Trial# ServersWireGuardJurisdiction
    + AirVPN + WWW + 201054 €Yes162No Italy
    + + + AzireVPN + + + WWW + + 2012 + 45 € + Yes + 22 + Yes + Sweden + + + + + blackVPN + + + WWW + + 2009 + 49 € + Yes + 31 + No + Hong Kong + + + + + Cryptostorm + + + WWW + Tor + + 2006 + $ 52 + Yes + 28 + Yes + Iceland + + + + + ExpressVPN + + + WWW + Tor + + 2009 + $ 99.95 + Yes + 148 + No + British Virgin Islands + + + + + FrootVPN + + + WWW + + 2014 + $ 35.88 + No + 27 + No + Sweden + + + + + hide.me + + + WWW + + 2012 + Free + Yes + 160+ + No + Malaysia + + + + + IVPN + + + WWW + + 2009 + $ 100 + Yes + 38 + Yes + Gibraltar + + + + + Mullvad + + + WWW + Tor + + 2009 + 60 € + No + 281 + Yes + Sweden + + + + + NordVPN + + + WWW + + 2012 + $ 83.88 + Yes + 5200+ + No + Panama + + + + + OVPN + + + WWW + + 2014 + 84 € + Yes + 67 + No + Sweden + + + + + Perfect Privacy + + + WWW + + 2008 + 119.99 € + No + 54 + No + Switzerland + + + + + ProtonVPN + + + WWW + + 2016 + Free + Yes + 396 + No + Switzerland + + + + + Proxy.sh + + + WWW + + 2012 + $ 40 + No + 300+ + No + Seychelles + + + + + Trust.Zone + + + WWW + + 2014 + $ 39.95 + Yes + 164 + No + Seychelles + + + + VPN.ht + + + WWW + + 2014 + $ 39.99 + No + 128 + No + Hong Kong + + + + VPNArea + + + WWW + + 2014 + $ 59 + Yes + 204 + No + Bulgaria + + + + VPNTunnel + + + WWW + + 2014 + 35.88 € + No + 800+ + No + Seychelles + + >>>>>>> origin/master + + +