diff --git a/_includes/sections/email-providers.html b/_includes/sections/email-providers.html index 07d1cb24..b49cbd0f 100644 --- a/_includes/sections/email-providers.html +++ b/_includes/sections/email-providers.html @@ -5,372 +5,188 @@
- <<<<<<< HEAD - - - - - - - - - - - - - +
Email ServiceWebsiteSinceServerStoragePrice / YearBitcoinEncryptionOwn Domain
+ + + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - + - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - + - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - -
Email ProviderWebsiteSinceJurisdictionStorageYearly PriceBitcoinEncryptionOwn Domain
- Protonmail - - WWW - Tor - 2013 Switzerland500 MBFreeAcceptedBuilt-inYes
+ Protonmail + + WWW + Tor + 2013 Switzerland500 MBFreeAcceptedBuilt-inYes
- Disroot - - WWW - 2015 Netherlands2 GBFreeAcceptedBuilt-inYes
+ Disroot + + WWW + 2015 Netherlands2 GBFreeAcceptedBuilt-inYes
- Tutanota - - WWW - 2011 Germany1 GBFreeNoBuilt-inYes
+ Tutanota + + WWW + 2011 Germany1 GBFreeNoBuilt-inYes
- Mailfence - - WWW - 2013 Belgium500 MBFreeAcceptedBuilt-inYes
+ Mailfence + + WWW + 2013 Belgium500 MBFreeAcceptedBuilt-inYes
- mailbox.org +
+ mailbox.org - - WWW - 2014 Germany2 GB12 €AcceptedBuilt-inYes
+ WWW + 2014 Germany2 GB12 €AcceptedBuilt-inYes
- Posteo - - WWW - 2009 Germany2 GB12 €NoBuilt-inNo
+ Posteo + + WWW + 2009 Germany2 GB12 €NoBuilt-inNo
- Runbox +
+ Runbox - - WWW - 1999 Norway1 GB$ 19.95YesNoYes
+ WWW + 1999 Norway1 GB$ 19.95YesNoYes
- Neomailbox - - WWW - 2003 Switzerland1 GB$ 49.95AcceptedBuilt-inYes
+ Neomailbox + + WWW + 2003 Switzerland1 GB$ 49.95AcceptedBuilt-inYes
- StartMail - - WWW - 2014 Netherlands10 GB$ 59.95AcceptedBuilt-inYes
+ StartMail + + WWW + 2014 Netherlands10 GB$ 59.95AcceptedBuilt-inYes
- Kolab Now - - WWW - 2010 Switzerland2 GB$ 60AcceptedNoYes
+ Kolab Now + + WWW + 2010 Switzerland2 GB$ 60AcceptedNoYes
- ======= - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
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 bbe10b31..eb09fab1 100644 --- a/_includes/sections/instant-messenger.html +++ b/_includes/sections/instant-messenger.html @@ -1,10 +1,7 @@

Encrypted Instant Messenger

@@ -50,32 +47,19 @@ web=""

Worth Mentioning

diff --git a/_includes/sections/operating-systems.html b/_includes/sections/operating-systems.html index 84fc93d9..3699f3c7 100644 --- a/_includes/sections/operating-systems.html +++ b/_includes/sections/operating-systems.html @@ -41,19 +41,9 @@

Worth Mentioning

-======= -
  • 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 59e45935..e4f62ce5 100644 --- a/_includes/sections/vpn.html +++ b/_includes/sections/vpn.html @@ -6,554 +6,291 @@ {% assign eur_to_usd = 1.14 %}
    - <<<<<<< HEAD - - - - - - - - - - - - - - - - - - - - - +
    Sortable VPN Providers TableWebsiteYearly PriceFree Trial# ServersWireGuardJurisdiction
    - AirVPN - WWW - 54 €Yes162No Italy
    + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ======= -
    VPN ProviderWebsiteSinceYearly PriceFree Trial# ServersWireGuardJurisdiction
    + AirVPN + WWW + 201054 €Yes162No Italy
    - AzireVPN - - WWW - 45 €Yes22Yes Sweden
    + AzireVPN + + WWW + 201245 €Yes22Yes Sweden
    - blackVPN - - WWW - 49 €Yes31No Hong Kong
    + blackVPN + + WWW + 200949 €Yes31No Hong Kong
    - Cryptostorm - - WWW - $ 52Yes28Yes Iceland
    + Cryptostorm + + WWW + Tor + 2006$ 52Yes28Yes Iceland
    - ExpressVPN - - WWW - $ 99.95 Yes148No British Virgin Islands
    + ExpressVPN + + WWW + Tor + 2009$ 99.95 Yes148No British Virgin Islands
    - FrootVPN - - WWW - $ 35.88No27No Sweden
    + FrootVPN + + WWW + 2014$ 35.88No27No Sweden
    - hide.me - - WWW - FreeYes160+No Malaysia
    + hide.me + + WWW + 2012FreeYes160+No Malaysia
    - IVPN - - WWW - $ 100Yes38Yes Gibraltar
    + IVPN + + WWW + 2009$ 100Yes38Yes Gibraltar
    - Mullvad - - WWW - Tor - 60 €No281Yes Sweden
    + Mullvad + + WWW + Tor + 200960 €No281Yes Sweden
    - NordVPN - - WWW - $ 83.88Yes5200+No Panama
    + NordVPN + + WWW + 2012$ 83.88Yes5200+No Panama
    - OVPN - - WWW - 84 €Yes67No Sweden
    + OVPN + + WWW + 201484 €Yes67No Sweden
    - Perfect Privacy - - WWW - 119.99 €No54No Switzerland
    + Perfect Privacy + + WWW + 2008119.99 €No54No Switzerland
    - ProtonVPN - - WWW - FreeYes396No Switzerland
    + ProtonVPN + + WWW + 2016FreeYes396No Switzerland
    - Proxy.sh - - WWW - $ 40No300+No Seychelles
    + Proxy.sh + + WWW + 2012$ 40No300+No Seychelles
    - Trust.Zone - - WWW - $ 39.95Yes164No Seychelles
    - VPN.ht - - WWW - $ 39.99No128No Hong Kong
    - VPNArea - - WWW - $ 59Yes204No Bulgaria
    - VPNTunnel - - WWW - 35.88 €No800+No Seychelles
    - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - >>>>>>> origin/master - - -
    VPN ProviderWebsiteSinceYearly PriceFree Trial# ServersWireGuardJurisdiction
    - AirVPN - WWW - 201054 €Yes162No Italy
    + Trust.Zone + + WWW + 2014$ 39.95Yes164No Seychelles
    + VPN.ht + + WWW + 2014$ 39.99No128No Hong Kong
    + VPNArea + + WWW + 2014$ 59Yes204No Bulgaria
    + VPNTunnel + + WWW + 201435.88 €No800+No Seychelles
    - AzireVPN - - WWW - 201245 €Yes22Yes Sweden
    - blackVPN - - WWW - 200949 €Yes31No Hong Kong
    - Cryptostorm - - WWW - Tor - 2006$ 52Yes28Yes Iceland
    - ExpressVPN - - WWW - Tor - 2009$ 99.95 Yes148No British Virgin Islands
    - FrootVPN - - WWW - 2014$ 35.88No27No Sweden
    - hide.me - - WWW - 2012FreeYes160+No Malaysia
    - IVPN - - WWW - 2009$ 100Yes38Yes Gibraltar
    - Mullvad - - WWW - Tor - 200960 €No281Yes Sweden
    - NordVPN - - WWW - 2012$ 83.88Yes5200+No Panama
    - OVPN - - WWW - 201484 €Yes67No Sweden
    - Perfect Privacy - - WWW - 2008119.99 €No54No Switzerland
    - ProtonVPN - - WWW - 2016FreeYes396No Switzerland
    - Proxy.sh - - WWW - 2012$ 40No300+No Seychelles
    - Trust.Zone - - WWW - 2014$ 39.95Yes164No Seychelles
    - VPN.ht - - WWW - 2014$ 39.99No128No Hong Kong
    - VPNArea - - WWW - 2014$ 59Yes204No Bulgaria
    - VPNTunnel - - WWW - 201435.88 €No800+No Seychelles
    + +