Cleanup merge conflicts
This commit is contained in:
nitrohorse
parent
e18870916a
commit
635152fbb1
@ -5,189 +5,6 @@
|
||||
</div>
|
||||
|
||||
<div class="table-responsive">
|
||||
<<<<<<< HEAD <table class="table sortable-theme-bootstrap" data-sortable>
|
||||
<thead>
|
||||
<tr>
|
||||
<th data-sortable="true">Email Service</th>
|
||||
<th data-sortable="false">Website</th>
|
||||
<th data-sortable="true">Since</th>
|
||||
<th data-sortable="true">Server</th>
|
||||
<th data-sortable="true">Storage</th>
|
||||
<th data-sortable="true">Price / Year</th>
|
||||
<th data-sortable="true">Bitcoin</th>
|
||||
<th data-sortable="true">Encryption</th>
|
||||
<th data-sortable="true">Own Domain</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
|
||||
<tr>
|
||||
<td data-value="ProtonMail">
|
||||
<img alt="Protonmail" src="/assets/img/provider/ProtonMail.ch.png" width="200" height="70">
|
||||
</td>
|
||||
<td>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://protonmail.com" href="https://protonmail.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://protonirockerxow.onion. Requires specific software to access: torproject.org" href="https://protonirockerxow.onion"><img alt="Tor" src="/assets/img/layout/tor.png" width="35"></a>
|
||||
</td>
|
||||
<td data-value="2013">2013</td>
|
||||
<td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
|
||||
<td data-value="500">500 MB</td>
|
||||
<td data-value="0"><span class="label label-warning">Free</span></td>
|
||||
<td data-value="1"><span class="label label-success">Accepted</span></td>
|
||||
<td data-value="1"><span class="label label-success">Built-in</span></td>
|
||||
<td data-value="1"><span class="label label-success">Yes</span></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td data-value="disroot.org">
|
||||
<img alt="Disroot" src="/assets/img/provider/disroot.org.png" width="200" height="70">
|
||||
</td>
|
||||
<td>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://disroot.org" href="https://disroot.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
|
||||
</td>
|
||||
<td data-value="2015">2015</td>
|
||||
<td><span class="flag-icon flag-icon-nl"></span> Netherlands</td>
|
||||
<td data-value="2000">2 GB</td>
|
||||
<td data-value="1"><span class="label label-warning">Free</span></td>
|
||||
<td data-value="1"><span class="label label-success">Accepted</span></td>
|
||||
<td data-value="1"><span class="label label-success">Built-in</span></td>
|
||||
<td data-value="1"><span class="label label-success">Yes</span></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td data-value="Tutanota">
|
||||
<img alt="Tutanota" src="/assets/img/provider/Tutanota.png" width="200" height="70">
|
||||
</td>
|
||||
<td>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.tutanota.com" href="https://www.tutanota.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
|
||||
</td>
|
||||
<td data-value="2011">2011</td>
|
||||
<td><span class="flag-icon flag-icon-de"></span> Germany</td>
|
||||
<td data-value="1000">1 GB</td>
|
||||
<td data-value="0"><span class="label label-warning">Free</span></td>
|
||||
<td data-value="0"><span class="label label-primary">No</span></td>
|
||||
<td data-value="1"><span class="label label-success">Built-in</span></td>
|
||||
<td data-value="1"><span class="label label-success">Yes</span></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td data-value="Mailfence">
|
||||
<img alt="Mailfence" src="/assets/img/provider/Mailfence.png" width="200" height="70">
|
||||
</td>
|
||||
<td>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailfence.com" href="https://mailfence.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
|
||||
</td>
|
||||
<td data-value="2013">2013</td>
|
||||
<td><span class="flag-icon flag-icon-be"></span> Belgium</td>
|
||||
<td data-value="500">500 MB</td>
|
||||
<td data-value="0"><span class="label label-warning">Free</span></td>
|
||||
<td data-value="1"><span class="label label-success">Accepted</span></td>
|
||||
<td data-value="1"><span class="label label-success">Built-in</span></td>
|
||||
<td data-value="1"><span class="label label-success">Yes</span></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td data-value="mailbox.org">
|
||||
<img alt="mailbox.org" src="/assets/img/provider/mailbox.org.png" width="200" height="70">
|
||||
|
||||
</td>
|
||||
<td>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailbox.org" href="https://mailbox.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35 " height="35"></a>
|
||||
</td>
|
||||
<td data-value="2014">2014</td>
|
||||
<td><span class="flag-icon flag-icon-de"></span> Germany</td>
|
||||
<td data-value="2000">2 GB</td>
|
||||
<td data-value="13">12 €</td>
|
||||
<td data-value="1"><span class="label label-success">Accepted</span></td>
|
||||
<td data-value="1"><span class="label label-success">Built-in</span></td>
|
||||
<td data-value="1"><span class="label label-success">Yes</span></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td data-value="Posteo">
|
||||
<img alt="Posteo" src="/assets/img/provider/Posteo.png" width="200" height="70">
|
||||
</td>
|
||||
<td>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://posteo.de" href="https://posteo.de"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
|
||||
</td>
|
||||
<td data-value="2009">2009</td>
|
||||
<td><span class="flag-icon flag-icon-de"></span> Germany</td>
|
||||
<td data-value="2000">2 GB</td>
|
||||
<td data-value="13">12 €</td>
|
||||
<td data-value="0"><span class="label label-primary">No</span></td>
|
||||
<td data-value="1"><span class="label label-success">Built-in</span></td>
|
||||
<td data-value="0"><span class="label label-primary">No</span></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td data-value="Runbox">
|
||||
<img alt="Runbox" src="/assets/img/provider/runbox.png" width="200" height="70">
|
||||
|
||||
</td>
|
||||
<td>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://runbox.com" href="https://runbox.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
|
||||
</td>
|
||||
<td data-value="1999">1999</td>
|
||||
<td><span class="flag-icon flag-icon-no"></span> Norway</td>
|
||||
<td data-value="1000">1 GB</td>
|
||||
<td data-value="20">$ 19.95</td>
|
||||
<td data-value="1"><span class="label label-primary">Yes</span></td>
|
||||
<td data-value="0"><span class="label label-primary">No</span></td>
|
||||
<td data-value="1"><span class="label label-success">Yes</span></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td data-value="Neomailbox">
|
||||
<img alt="Neomailbox" src="/assets/img/provider/Neomailbox.png" width="200" height="70">
|
||||
</td>
|
||||
<td>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.neomailbox.com" href="https://www.neomailbox.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
|
||||
</td>
|
||||
<td data-value="2003">2003</td>
|
||||
<td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
|
||||
<td data-value="1000">1 GB</td>
|
||||
<td data-value="50">$ 49.95</td>
|
||||
<td data-value="1"><span class="label label-success">Accepted</span></td>
|
||||
<td data-value="1"><span class="label label-success">Built-in</span></td>
|
||||
<td data-value="1"><span class="label label-success">Yes</span></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td data-value="StartMail">
|
||||
<img alt="StartMail" src="/assets/img/provider/StartMail.png" width="200" height="70">
|
||||
</td>
|
||||
<td>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.startmail.com" href="https://www.startmail.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
|
||||
</td>
|
||||
<td data-value="2014">2014</td>
|
||||
<td><span class="flag-icon flag-icon-nl"></span> Netherlands</td>
|
||||
<td data-value="10000">10 GB</td>
|
||||
<td data-value="60">$ 59.95</td>
|
||||
<td data-value="0"><span class="label label-success">Accepted</span></td>
|
||||
<td data-value="1"><span class="label label-success">Built-in</span></td>
|
||||
<td data-value="1"><span class="label label-success">Yes</span></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td data-value="Kolab Now">
|
||||
<img alt="Kolab Now" src="/assets/img/provider/Kolab-Now.png" width="200" height="70">
|
||||
</td>
|
||||
<td>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://kolabnow.com" href="https://kolabnow.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
|
||||
</td>
|
||||
<td data-value="2010">2010</td>
|
||||
<td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
|
||||
<td data-value="2048">2 GB</td>
|
||||
<td data-value="60">$ 60</td>
|
||||
<td data-value="1"><span class="label label-success">Accepted</span></td>
|
||||
<td data-value="0"><span class="label label-primary">No</span></td>
|
||||
<td data-value="1"><span class="label label-success">Yes</span></td>
|
||||
</tr>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
=======
|
||||
<table class="table sortable-theme-bootstrap" data-sortable>
|
||||
<thead>
|
||||
<tr>
|
||||
@ -276,7 +93,7 @@
|
||||
|
||||
</td>
|
||||
<td>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailbox.org" href="https://mailbox.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35 " height="35"></a>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailbox.org" href="https://mailbox.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35 "height="35"></a>
|
||||
</td>
|
||||
<td data-value="2014">2014</td>
|
||||
<td><span class="flag-icon flag-icon-de"></span> Germany</td>
|
||||
@ -370,7 +187,6 @@
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
>>>>>>> origin/master
|
||||
</div>
|
||||
|
||||
<h3>Interesting Email Providers Under Development</h3>
|
||||
|
||||
@ -1,10 +1,7 @@
|
||||
<h1 id="im" class="anchor"><a href="#im"><i class="fas fa-link anchor-icon"></i></a> Encrypted Instant Messenger</h1>
|
||||
|
||||
<div class="alert alert-warning" role="alert">
|
||||
<<<<<<< HEAD <strong>If you are currently using an Instant Messenger like LINE, Telegram, Viber, <a href="https://www.eff.org/deeplinks/2016/10/where-whatsapp-went-wrong-effs-four-biggest-security-concerns">WhatsApp</a> or plain SMS messages you should pick an alternative here.</strong>
|
||||
=======
|
||||
<strong>If you are currently using an Instant Messenger like LINE, Telegram, Viber, <a href="https://www.eff.org/deeplinks/2016/10/where-whatsapp-went-wrong-effs-four-biggest-security-concerns">WhatsApp</a>, or plain SMS messages you should pick an alternative here.</strong>
|
||||
>>>>>>> origin/master
|
||||
</div>
|
||||
|
||||
|
||||
@ -50,18 +47,6 @@ web=""
|
||||
<h3>Worth Mentioning</h3>
|
||||
|
||||
<ul>
|
||||
<<<<<<< HEAD <li><a href="https://ricochet.im/">Ricochet</a> - Ricochet uses the <a href="/browsers/#browser"><i class="fas fa-link"></i> Tor network</a> to reach your contacts without relying on messaging servers. It creates a hidden service, which is used to rendezvous with your contacts without revealing your location or IP address. <span class="badge badge-warning" data-toggle="tooltip" title="This software is an experiment."><a href="https://github.com/ricochet-im/ricochet#experimental">Experimental</a></span> <span class="badge badge-danger">Danger</span> <a href="#ricochetTor">Keep Tor up to date</a></li>
|
||||
<li><a href="https://retroshare.cc/">RetroShare</a> - An E2E encrypted instant messaging and voice/video call client. RetroShare supports both TOR and I2P. </li>
|
||||
<li><a href="https://xmpp.org/">XMPP</a> federated clients with <a href="https://conversations.im/omemo/">OMEMO</a> support:</li>
|
||||
<ul>
|
||||
<li><a href="https://monal.im/">Monal</a> (iOS, MacOS) - An XMPP client in active development.</li>
|
||||
<li><a href="https://conversations.im/">Conversations</a> (Android) - An open source Jabber/XMPP client for Android 4.4+ smartphones. Supports end-to-end encryption with either OMEMO or OpenPGP.</li>
|
||||
<li><a href="https://gajim.org/">Gajim</a> (FreeBSD, Linux, Windows) - An open source fully featured XMPP client.</li>
|
||||
<li><a href="https://omemo.top/">List of OMEMO ready clients</a></li>
|
||||
</ul>
|
||||
<li><a href="https://www.kontalk.org/">Kontalk</a> - A community-driven instant messaging network. Supports end-to-end encryption. Both client-to-server and server-to-server channels are fully encrypted.</li>
|
||||
<li><a href="https://status.im/">Status</a> - <span class="badge badge-warning">Experimental</span> A free and open-source, peer-to-peer, encrypted instant messanger with support for DAPPs. </li>
|
||||
=======
|
||||
<li><a href="https://briarproject.org/">Briar</a> - An ultra-secure peer-to-peer instant messenger that connects to contacts via Direct Wi-Fi, Bluetooth, or Tor over the internet, keeping its users protected from surveillance and censorship.
|
||||
<li><a href="https://retroshare.cc/">RetroShare</a> - An E2E encrypted instant messaging and voice/video call client. RetroShare supports both TOR and I2P. </li>
|
||||
<li><a href="https://xmpp.org/">XMPP</a> - Federated instant messaging protocol with <a href="https://conversations.im/omemo/">OMEMO</a>, OTR, or OpenPGP end-to-end encryption:</li>
|
||||
@ -75,7 +60,6 @@ web=""
|
||||
<li><a href="https://keybase.io/">Keybase</a> - <span class="badge badge-warning" data-toggle="tooltip" title="This software relies on a closed-source central server.">Warning</span> End-to-end encrypted messaging with social verification.</li>
|
||||
<li><a href="https://status.im/">Status</a> - <span class="badge badge-warning">Experimental</span> A free and open-source, peer-to-peer, encrypted instant messanger with support for DAPPs.</li>
|
||||
<li><a href="https://ricochet.im/">Ricochet</a> - <span class="badge badge-danger" data-toggle="tooltip" title="This software is safe if you manually keep Tor up to date."><a href="#ricochetTor" class="text-white">Danger</a></span> <span class="badge badge-warning" data-toggle="tooltip" title="This software is considered safe but experimental and the client has not been updated since 2016."><a href="https://github.com/ricochet-im/ricochet#experimental">Experimental</a></span> Ricochet uses the <a href="/browsers/#browser"><i class="fas fa-link"></i> Tor network</a> to reach your contacts without relying on messaging servers. It creates a hidden service, which is used to rendezvous with your contacts without revealing your location or IP address.</li>
|
||||
>>>>>>> origin/master
|
||||
</ul>
|
||||
|
||||
|
||||
|
||||
@ -41,19 +41,9 @@
|
||||
<h3>Worth Mentioning</h3>
|
||||
|
||||
<ul>
|
||||
<<<<<<< HEAD <li><a href="https://www.openbsd.org/">OpenBSD</a> - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.</li>
|
||||
<li><a href="https://www.openbsd.org/">OpenBSD</a> - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.</li>
|
||||
<li><a href="https://www.archlinux.org/">Arch Linux</a> - A simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement. <a href="https://www.parabola.nu/">Parabola</a> is a
|
||||
completely open source version of Arch Linux.</li>
|
||||
<li><a href="https://www.whonix.org/">Whonix</a> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A Debian GNU/Linux based security-focused Linux distribution. It aims to provide privacy, security and anonymity on the internet. The operating system consists of two virtual machines, a "Workstation"
|
||||
and a Tor "Gateway". All communication are forced through the Tor network to accomplish this.</li>
|
||||
<li><a href="https://subgraph.com/">Subgraph OS</a> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - 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.</li>
|
||||
</ul>
|
||||
=======
|
||||
<li><a href="https://www.openbsd.org/">OpenBSD</a> - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.</li>
|
||||
<li><a href="https://www.archlinux.org/">Arch Linux</a> - A simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement. <a href="https://www.parabola.nu/">Parabola</a> is a
|
||||
completely open source version of Arch Linux.</li>
|
||||
<li><a href="https://www.whonix.org/">Whonix</a> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A Debian GNU/Linux based security-focused Linux distribution. It aims to provide privacy, security and anonymity on the internet. The operating system consists of two virtual machines, a "Workstation"
|
||||
and a Tor "Gateway". All communication are forced through the Tor network to accomplish this.</li>
|
||||
</ul>
|
||||
>>>>>>> origin/master
|
||||
@ -6,268 +6,6 @@
|
||||
|
||||
{% assign eur_to_usd = 1.14 %}
|
||||
<div class="table-responsive">
|
||||
<<<<<<< HEAD <table class="table sortable-theme-bootstrap" data-sortable>
|
||||
<thead>
|
||||
<tr>
|
||||
<th data-sortable="true">Sortable VPN Providers Table</th>
|
||||
<th data-sortable="false">Website</th>
|
||||
<th data-sortable="true">Yearly Price</th>
|
||||
<th data-sortable="true">Free Trial</th>
|
||||
<th data-sortable="true" title="Number of Servers"># Servers</th>
|
||||
<th data-sortable="true">WireGuard</th>
|
||||
<th data-sortable="true">Jurisdiction</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td data-value="AirVPN">
|
||||
<a href="https://airvpn.org/"><img alt="AirVPN" src="/assets/img/provider/AirVPN.png" width="200" height="70"></a></td>
|
||||
<td>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://airvpn.org/" href="https://airvpn.org/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
|
||||
</td>
|
||||
<td data-value="{{ 54 | times: eur_to_usd }}">54 €</td>
|
||||
<td><span class="label label-success">Yes</span></td>
|
||||
<td>162</td>
|
||||
<td><span class="label label-warning">No</span></td>
|
||||
<td><span class="flag-icon flag-icon-it"></span> Italy</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td data-value="AzireVPN">
|
||||
<a href="https://www.azirevpn.com/"><img alt="AzireVPN" src="/assets/img/provider/AzireVPN.png" width="200" height="70"></a>
|
||||
</td>
|
||||
<td>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.azirevpn.com/" href="https://www.azirevpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
|
||||
</td>
|
||||
<td data-value="{{ 45 | times: eur_to_usd }}">45 €</td>
|
||||
<td><span class="label label-success">Yes</span></td>
|
||||
<td>22</td>
|
||||
<td><span class="label label-success">Yes</span></td>
|
||||
<td><span class="flag-icon flag-icon-se"></span> Sweden</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td data-value="blackVPN">
|
||||
<a href="https://www.blackvpn.com/"><img alt="blackVPN" src="/assets/img/provider/blackVPN.png" width="200" height="70"></a>
|
||||
</td>
|
||||
<td>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.blackvpn.com/" href="https://www.blackvpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
|
||||
</td>
|
||||
<td data-value="{{ 49 | times: eur_to_usd }}">49 €</td>
|
||||
<td><span class="label label-success">Yes</span></td>
|
||||
<td>31</td>
|
||||
<td><span class="label label-warning">No</span></td>
|
||||
<td><span class="flag-icon flag-icon-hk"></span> Hong Kong</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td data-value="Cryptostorm">
|
||||
<a href="https://cryptostorm.is/"><img alt="Cryptostorm" src="/assets/img/provider/Cryptostorm.png" width="200" height="70"></a>
|
||||
</td>
|
||||
<td>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://cryptostorm.is/" href="https://cryptostorm.is/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
|
||||
</td>
|
||||
<td data-value="52">$ 52</td>
|
||||
<td><span class="label label-success">Yes</span></td>
|
||||
<td>28</td>
|
||||
<td><span class="label label-success">Yes</span></td>
|
||||
<td><span class="flag-icon flag-icon-is"></span> Iceland</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td data-value="ExpressVPN">
|
||||
<a href="https://www.expressvpn.com/"><img alt="ExpressVPN" src="/assets/img/provider/ExpressVPN.png" width="200" height="70"></a>
|
||||
</td>
|
||||
<td>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.expressvpn.com/" href="https://www.expressvpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
|
||||
</td>
|
||||
<td data-value="100">$ 99.95</td> <!-- USD on December 28, 2018 -->
|
||||
<td><span class="label label-success">Yes</span></td>
|
||||
<td>148</td>
|
||||
<td><span class="label label-warning">No</span></td>
|
||||
<td><span class="flag-icon flag-icon-vg"></span> British Virgin Islands</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td data-value="FrootVPN">
|
||||
<a href="https://www.frootvpn.com/"><img alt="FrootVPN" src="/assets/img/provider/FrootVPN.png" width="200" height="70"></a>
|
||||
</td>
|
||||
<td>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.frootvpn.com/" href="https://www.frootvpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
|
||||
</td>
|
||||
<td data-value="36">$ 35.88</td>
|
||||
<td><span class="label label-warning">No</span></td>
|
||||
<td>27</td>
|
||||
<td><span class="label label-warning">No</span></td>
|
||||
<td><span class="flag-icon flag-icon-se"></span> Sweden</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td data-value="hide.me">
|
||||
<a href="https://hide.me/"><img alt="hide.me" src="/assets/img/provider/hide.me.png" width="200" height="70"></a>
|
||||
</td>
|
||||
<td>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://hide.me/" href="https://hide.me/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
|
||||
</td>
|
||||
<td data-value="0"><a data-toggle="tooltip" data-placement="bottom" data-original-title="2 GB data transfer, 1 simultaneous connection" href="https://hide.me/pricing">Free</a></td>
|
||||
<td><span class="label label-success">Yes</span></td>
|
||||
<td>160+</td>
|
||||
<td><span class="label label-warning">No</span></td>
|
||||
<td><span class="flag-icon flag-icon-my"></span> Malaysia</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td data-value="IVPN">
|
||||
<a href="https://www.ivpn.net/"><img alt="IVPN" src="/assets/img/provider/IVPN.png" width="200" height="70"></a>
|
||||
</td>
|
||||
<td>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.ivpn.net/" href="https://www.ivpn.net/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
|
||||
</td>
|
||||
<td data-value="100">$ 100</td>
|
||||
<td><span class="label label-success">Yes</span></td>
|
||||
<td>38</td>
|
||||
<td><span class="label label-success">Yes</span></td>
|
||||
<td><span class="flag-icon flag-icon-gi"></span> Gibraltar</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td data-value="Mullvad">
|
||||
<a href="https://mullvad.net/"><img alt="Mullvad" src="/assets/img/provider/Mullvad.png" width="200" height="70"></a>
|
||||
</td>
|
||||
<td>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mullvad.net/" href="https://mullvad.net/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="http://xcln5hkbriyklr6n.onion. Requires specific software to access: torproject.org" href="http://xcln5hkbriyklr6n.onion/"><img alt="Tor" src="/assets/img/layout/tor.png" width="35"></a>
|
||||
</td>
|
||||
<td data-value="{{ 60 | times: eur_to_usd }}">60 €</td>
|
||||
<td><span class="label label-success">No</span></td>
|
||||
<td>281</td>
|
||||
<td><span class="label label-success">Yes</span></td>
|
||||
<td><span class="flag-icon flag-icon-se"></span> Sweden</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td data-value="NordVPN">
|
||||
<a href="https://nordvpn.com/"><img alt="NordVPN" src="/assets/img/provider/NordVPN.png" width="200" height="70"></a>
|
||||
</td>
|
||||
<td>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://nordvpn.com/" href="https://nordvpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
|
||||
</td>
|
||||
<td data-value="84">$ 83.88</td>
|
||||
<td><span class="label label-success">Yes</span></td>
|
||||
<td>5200+</td>
|
||||
<td><span class="label label-warning">No</span></td>
|
||||
<td><span class="flag-icon flag-icon-pa"></span> Panama</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td data-value="OVPN.com">
|
||||
<a href="https://www.ovpn.com/"><img alt="OVPN" src="/assets/img/provider/ovpn.png" width="200" height="70"></a>
|
||||
</td>
|
||||
<td>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.ovpn.com/" href="https://www.ovpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
|
||||
</td>
|
||||
<td data-value="{{ 84 | times: eur_to_usd }}">84 €</td>
|
||||
<td><span class="label label-success">Yes</span></td>
|
||||
<td>67</td>
|
||||
<td><span class="label label-warning">No</span></td>
|
||||
<td><span class="flag-icon flag-icon-se"></span> Sweden</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td data-value="Perfect Privacy">
|
||||
<a href="https://www.perfect-privacy.com/"><img alt="Perfect Privacy" src="/assets/img/provider/Perfect-Privacy.png" width="200" height="70"></a>
|
||||
</td>
|
||||
<td>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.perfect-privacy.com/" href="https://www.perfect-privacy.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
|
||||
</td>
|
||||
<td data-value="{{ 119.99 | times: eur_to_usd }}">119.99 €</td>
|
||||
<td><span class="label label-warning">No</span></td>
|
||||
<td>54</td>
|
||||
<td><span class="label label-warning">No</span></td>
|
||||
<td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td data-value="ProtonVPN">
|
||||
<a href="https://protonvpn.com/"><img alt="ProtonVPN" src="/assets/img/provider/ProtonVPN.png" width="200" height="70"></a>
|
||||
</td>
|
||||
<td>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://protonvpn.com/" href="https://protonvpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
|
||||
</td>
|
||||
<td data-value="0"><a data-toggle="tooltip" data-placement="bottom" data-original-title="3 countries, 1 device, speed: low" href="https://protonvpn.com/pricing">Free</a></td>
|
||||
<td><span class="label label-success">Yes</span></td>
|
||||
<td>396</td>
|
||||
<td><span class="label label-warning">No</span></td>
|
||||
<td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td data-value="Proxy.sh">
|
||||
<a href="https://proxy.sh/"><img alt="Proxy.sh" src="/assets/img/provider/Proxy.sh.png" width="200" height="70"></a>
|
||||
</td>
|
||||
<td>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://proxy.sh/" href="https://proxy.sh/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
|
||||
</td>
|
||||
<td data-value="40">$ 40</td>
|
||||
<td><span class="label label-warning">No</span></td>
|
||||
<td>300+</td>
|
||||
<td><span class="label label-warning">No</span></td>
|
||||
<td><span class="flag-icon flag-icon-sc"></span> Seychelles</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td data-value="Trust.Zone">
|
||||
<a href="https://trust.zone/"><img alt="Trust.Zone" src="/assets/img/provider/Trust.Zone.png" width="200" height="70"></a>
|
||||
</td>
|
||||
<td>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://trust.zone/" href="https://trust.zone/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
|
||||
</td>
|
||||
<td data-value="40">$ 39.95</td>
|
||||
<td><span class="label label-success">Yes</span></td>
|
||||
<td>164</td>
|
||||
<td><span class="label label-warning">No</span></td>
|
||||
<td><span class="flag-icon flag-icon-sc"></span> Seychelles</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td data-value="VPN.ht">
|
||||
<a href="https://vpn.ht/"><img alt="VPN.ht" src="/assets/img/provider/VPN.ht.png" width="200" height="70"></a>
|
||||
</td>
|
||||
<td>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://vpn.ht/" href="https://vpn.ht/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
|
||||
</td>
|
||||
<td data-value="40">$ 39.99</td>
|
||||
<td><span class="label label-warning">No</span></td>
|
||||
<td>128</td>
|
||||
<td><span class="label label-warning">No</span></td>
|
||||
<td><span class="flag-icon flag-icon-hk"></span> Hong Kong</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td data-value="VPNArea">
|
||||
<a href="https://vpnarea.com/"><img alt="VPNArea" src="/assets/img/provider/vpnarea.png" width="200" height="70"></a>
|
||||
</td>
|
||||
<td>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://vpnarea.com/" href="https://vpnarea.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
|
||||
</td>
|
||||
<td data-value="59">$ 59</td>
|
||||
<td><span class="label label-success">Yes</span></td>
|
||||
<td>204</td>
|
||||
<td><span class="label label-warning">No</span></td>
|
||||
<td><span class="flag-icon flag-icon-bg"></span> Bulgaria</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td data-value="VPNTunnel">
|
||||
<a href="https://vpntunnel.com/"><img alt="VPNTunnel" src="/assets/img/provider/VPNTunnel.png" width="200" height="70"></a>
|
||||
</td>
|
||||
<td>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://vpntunnel.com/" href="https://vpntunnel.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
|
||||
</td>
|
||||
<td data-value="{{ 35.88 | times: eur_to_usd }}">35.88 €</td>
|
||||
<td><span class="label label-warning">No</span></td>
|
||||
<td>800+</td>
|
||||
<td><span class="label label-warning">No</span></td>
|
||||
<td><span class="flag-icon flag-icon-sc"></span> Seychelles</td>
|
||||
</tr>
|
||||
=======
|
||||
<table class="table sortable-theme-bootstrap" data-sortable>
|
||||
<thead>
|
||||
<tr>
|
||||
@ -466,7 +204,7 @@
|
||||
|
||||
<tr>
|
||||
<td data-value="ProtonVPN">
|
||||
<a href="https://protonvpn.com/"><img alt="ProtonVPN" src="/assets/img/provider/ProtonVPN.png" width="200" height="70"></a>
|
||||
<a href="https://protonvpn.com/"><img alt="ProtonVPN" src="/assets/img/provider/ProtonVPN.png" width="200" height="70"></a >
|
||||
</td>
|
||||
<td>
|
||||
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://protonvpn.com/" href="https://protonvpn.com/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
|
||||
@ -550,7 +288,6 @@
|
||||
<td><span class="label label-warning">No</span></td>
|
||||
<td><span class="flag-icon flag-icon-sc"></span> Seychelles</td>
|
||||
</tr>
|
||||
>>>>>>> origin/master
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
Reference in New Issue
Block a user