README.md

@@ -38,4 +38,4 @@ You can submit your suggestions here on GitHub [(Issues)](https://github.com/pri
 - [Português / Portuguese](https://www.privacidade.digital/) - [GitHub](https://github.com/PrivacidadeDigital/privacidade.digital)
 
 # License
-[Creative Commons CC0 1.0](https://www.privacytools.io/LICENSE.txt)
+[Creative Commons Zero v1.0 Universal](https://www.privacytools.io/LICENSE.txt)

_includes/nav.html

@@ -22,7 +22,6 @@
             <a class="dropdown-item" href="/providers/social-networks/"><i class="fas fa-expand-arrows-alt fa-fw"></i> Social Networks</a>
             <a class="dropdown-item" href="/providers/dns/"><i class="fa fa-tasks fa-fw"></i> DNS</a>
             <a class="dropdown-item" href="/providers/hosting/"><i class="fas fa-database fa-fw"></i> Hosting</a>
-            <a class="dropdown-item" href="/providers/paste"><i class="fas fa-paste fa-fw"></i> PasteBins</a>
           </div>
         </li>
         <li class="nav-item dropdown">
@@ -91,7 +90,7 @@
         </li>
         <li class="nav-item dropdown">
           <a class="nav-link dropdown-toggle" href="/services/" id="browserDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-            Services <span class="badge badge-success">New</span>
+            Services
           </a>
           <div class="dropdown-menu" aria-labelledby="servicesDropdown">
             <a class="dropdown-item" href="https://search.privacytools.io/"><i class="fas fa-search fa-fw"></i> Searx - Privacy Friendly Search</a>

_includes/sections/dns.html

@@ -30,7 +30,7 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://github.com/quidsup/notrack">NoTrack</a> - A network-wide DNS server which blocks Tracking sites. Currently works in Debian and Ubuntu.</li>
+  <li><a href="https://gitlab.com/quidsup/notrack">NoTrack</a> - A network-wide DNS server which blocks Tracking sites. Currently works in Debian and Ubuntu.</li>
   <li><a href="https://namecoin.info/">Namecoin</a> - A decentralized DNS open source information registration and transfer system based on the Bitcoin cryptocurrency.</li>
   <li><a href="https://pi-hole.net/">Pi-hole</a> - A network-wide DNS server for the Raspberry Pi.  Blocks advertising and tracking domains for all devices on your network.</li>
-</ul>
+</ul>

_includes/sections/file-sharing.html

@@ -1,28 +1,37 @@
 <h1 id="filesharing" class="anchor"><a href="#filesharing"><i class="fas fa-link anchor-icon"></i></a> File Sharing</h1>
 
-<div class="row mb-2">
+{% include cardv2.html
-  {% include card.html color="success"
+title="Firefox Send"
-  title="OnionShare"
+image="/assets/img/tools/Firefox-Send.png"
-  image="/assets/img/tools/OnionShare.png"
+website="https://send.firefox.com/"
-  url="https://onionshare.org/"
+description="Send uses end-to-end encryption to keep your data secure from the moment you share to the moment your file is opened. It also offers security controls that you can set. You can choose when your file link expires, the number of downloads, and whether to add an optional password for an extra layer of security."
-  tor="http://elx57ue5uyfplgva.onion/"
+forum="https://forum.privacytools.io/t/discussion-firefox-send/755"
-  footer="OS: Windows, macOS, Linux."
+github="https://github.com/mozilla/send"
-  description="OnionShare is an open source tool that lets you securely and anonymously share a file of any size. It works by starting a web server, making it accessible as a Tor onion service, and generating an unguessable URL to access and download the files. It doesn't require setting up a server on the internet somewhere or using a third-party filesharing service. You host the file on your own computer and use a Tor onion service to make it temporarily accessible over the internet."
+web=""
-  %}
+android=""
+%}
 
-  {% include card.html color="primary"
+{% include cardv2.html
-  title="Firefox Send"
+title="OnionShare"
-  image="/assets/img/tools/Firefox-Send.png"
+image="/assets/img/tools/OnionShare.png"
-  url="https://send.firefox.com/"
+website="https://onionshare.org/"
-  footer='OS: Browser and Android'
+tor="http://elx57ue5uyfplgva.onion/"
-  description="Send uses end-to-end encryption to keep your data secure from the moment you share to the moment your file is opened. It also offers security controls that you can set. You can choose when your file link expires, the number of downloads, and whether to add an optional password for an extra layer of security."
+description="OnionShare is an open source tool that lets you securely and anonymously share a file of any size. It works by starting a web server, making it accessible as a Tor onion service, and generating an unguessable URL to access and download the files."
-  %}
+forum="https://forum.privacytools.io/t/discussion-onionshare/754"
+github="https://github.com/micahflee/onionshare"
+windows=""
+mac=""
+linux=""
+%}
 
-  {% include card.html color="warning"
+{% include cardv2.html
-  title="Magic Wormhole"
+title="Magic Wormhole"
-  image="/assets/img/tools/Magic-Wormhole.png"
+image="/assets/img/tools/Magic-Wormhole.png"
-  url="https://github.com/warner/magic-wormhole"
+website="https://github.com/warner/magic-wormhole"
-  footer="OS: cross-platform"
+description="Get things from one computer to another, safely. This package provides a library and a command-line tool named wormhole, which makes it possible to get arbitrary-sized files and directories (or short pieces of text) from one computer to another."
-  description="Get things from one computer to another, safely. This package provides a library and a command-line tool named wormhole, which makes it possible to get arbitrary-sized files and directories (or short pieces of text) from one computer to another. The two endpoints are identified by using identical wormhole codes: in general, the sending machine generates and displays the code, which must then be typed into the receiving machine."
+forum="https://forum.privacytools.io/t/discussion-magic-wormhole/756"
-  %}
+github="https://github.com/warner/magic-wormhole"
-</div>
+windows=""
+mac=""
+linux=""
+%}

_includes/sections/voice-video-messenger.html

@@ -3,37 +3,56 @@
 <div class="alert alert-warning" role="alert">
   <strong>If you are currently using a Video & Voice Messenger like Skype, Viber or Google Hangouts, you should pick an alternative here.</strong>
 </div>
-<div class="row mb-2">
-  {% include card.html color="success"
-  title="Mobile: Signal"
-  image="/assets/img/tools/Signal.png"
-  url="https://signal.org"
-  footer="OS: Android, iOS, macOS, Windows, Linux"
-  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, enabling anyone to verify its security by auditing the code. The development team is supported by community donations and grants. There are no advertisements,
-  and it doesn't cost anything to use."
-  %}
 
-  {% include card.html color="primary"
+{% include cardv2.html
-  title="Wire"
+title="Mobile: Signal"
-  image="/assets/img/tools/wire.png"
+image="/assets/img/tools/Signal.png"
-  url="https://get.wire.com"
+website="https://signal.org"
-  footer="OS: Android, iOS, macOS, Windows, Linux, Web"
+description="Signal is a mobile app developed by Open Whisper Systems. The app provides instant messaging, as well as voice and video calling.
-  description="Wire is an app developed by Wire Swiss GmbH.
+All communications are end-to-end encrypted. Signal is free and open source."
-  The Wire app allows users to exchange end-to-end encrypted instant messages, as well as make voice and video calls. Wire is free and open source, enabling anyone to verify its security by auditing the code.
+forum="https://forum.privacytools.io/t/discussion-signal/664"
-  The development team is backed by Iconical and they will monetize in the future with premium features/services.<br>
+github="https://github.com/signalapp"
-  <b>Caution:</b> The company keeps a list of all the users you contact until you delete your account."
+android=""
-  %}
+ios=""
+mac=""
+windows=""
+linux=""
+footer="OS: Android, iOS, macOS, Windows, Linux"
+%}
+
+{% include cardv2.html
+title="Wire"
+image="/assets/img/tools/wire.png"
+website="https://wire.com/download/"
+description="Wire is an app developed by Wire Swiss GmbH.
+The Wire app allows users to exchange end-to-end encrypted instant messages, as well as make voice and video calls. Wire is free and open source. <span class=\"badge badge-warning\" data-toggle=\"tooltip\" title=\"The company keeps a list of all the users you contact until you delete your account.\">Caution <i class=\"far fa-question-circle\"></i></span>"
+forum="https://forum.privacytools.io/t/discussion-wire/750"
+github="https://github.com/wireapp"
+android=""
+ios=""
+mac=""
+windows=""
+linux=""
+web=""
+%}
+
+{% include cardv2.html
+title="Linphone"
+image="/assets/img/tools/Linphone.png"
+website="https://www.linphone.org/"
+description="Linphone is an open source SIP Phone and a free voice over IP service, available on mobile and desktop environments and on web browsers. It supports ZRTP for end-to-end encrypted voice and video communication."
+forum="https://forum.privacytools.io/t/discussion-linphone/751"
+github="https://github.com/BelledonneCommunications"
+ios=""
+android=""
+windows=""
+linux=""
+mac=""
+web=""
+%}
+
 
-  {% include card.html color="warning"
-  title="Linphone"
-  image="/assets/img/tools/Linphone.png"
-  url="https://www.linphone.org/"
-  footer="OS: iOS, Android, Windows Phone, Linux, Windows, macOS, Browser (Web)"
-  description="Linphone is an open source SIP Phone and a free voice over IP service, available on mobile and desktop environments and on web browsers. It supports ZRTP for end-to-end encrypted voice and video communication."
-  %}
 
-</div>
 
 <h3>Worth Mentioning</h3>
 

_includes/sections/vpn.html

@@ -13,6 +13,7 @@
         <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>
         <th data-sortable="false">Website</th>
       </tr>
@@ -24,6 +25,7 @@
         <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>
         <td><a href="https://airvpn.org/">AirVPN.org</a></td>
       </tr>
@@ -35,6 +37,7 @@
         <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>
         <td><a href="https://www.azirevpn.com/">AzireVPN.com</a></td>
       </tr>
@@ -46,6 +49,7 @@
         <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>
         <td><a href="https://www.blackvpn.com/">blackVPN.com</a></td>
       </tr>
@@ -57,6 +61,7 @@
         <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>
         <td><a href="https://cryptostorm.is/">Cryptostorm.is</a></td>
       </tr>
@@ -68,6 +73,7 @@
         <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>
         <td><a href="https://www.expressvpn.com/">ExpressVPN.com</a></td>
       </tr>
@@ -79,6 +85,7 @@
         <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>
         <td><a href="https://www.frootvpn.com/">FrootVPN.com</a></td>
       </tr>
@@ -90,6 +97,7 @@
         <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>
         <td><a href="https://hide.me/">hide.me</a></td>
       </tr>
@@ -101,6 +109,7 @@
         <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>
         <td><a href="https://www.ivpn.net/">IVPN.net</a></td>
       </tr>
@@ -112,6 +121,7 @@
         <td data-value="{{ 60 | times: eur_to_usd }}">60 €</td>
         <td><span class="label label-success">Yes</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>
         <td><a href="https://mullvad.net/">Mullvad.net</a></td>
       </tr>
@@ -123,6 +133,7 @@
         <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>
         <td><a href="https://nordvpn.com/">NordVPN.com</a></td>
       </tr>
@@ -134,6 +145,7 @@
         <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>
         <td><a href="https://www.ovpn.com/">OVPN.com</a></td>
       </tr>
@@ -145,6 +157,7 @@
         <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>
         <td><a href="https://www.perfect-privacy.com/">Perfect-Privacy.com</a></td>
       </tr>
@@ -156,6 +169,7 @@
         <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>
         <td><a href="https://protonvpn.com/">ProtonVPN.com</a></td>
       </tr>
@@ -167,6 +181,7 @@
         <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>
         <td><a href="https://proxy.sh/">Proxy.sh</a></td>
       </tr>
@@ -178,6 +193,7 @@
         <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>
         <td><a href="https://trust.zone/">Trust.Zone</a></td>
       </tr>
@@ -188,6 +204,7 @@
         <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>
         <td><a href="https://vpn.ht/">VPN.ht</a></td>
       </tr>
@@ -198,6 +215,7 @@
         <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>
         <td><a href="https://vpnarea.com/">VPNArea.com</a></td>
       </tr>
@@ -208,6 +226,7 @@
         <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>
         <td><a href="https://vpntunnel.com/">VPNTunnel.com</a></td>
       </tr>
@@ -226,7 +245,7 @@
       <h3>Our VPN Provider Criteria</h3>
 
       <ul>
-        <li>Operating outside the USA or other Five Eyes countries.<p>More: <a href="https://www.bestvpn.com/the-ultimate-privacy-guide/#avoidus">Avoid all US and UK based services.</a></p></li>
+        <li>Operating outside the USA or other Five Eyes countries.<br>More: <a href="https://www.bestvpn.com/the-ultimate-privacy-guide/#avoidus">Avoid all US and UK based services.</a></li>
         <li>OpenVPN software support.</li>
         <li>Accepts Bitcoin, cash, debit cards or cash cards as a payment method.</li>
         <li>No personal information is required to create an account. Only username, password and <a href="/providers/email/"><i class="fas fa-link"></i> Email.</a></li>
@@ -235,14 +254,10 @@
       <p>We're not affiliated with any of the above-listed VPN providers. This way we can give you honest recommendations.</p>
 
       <h3>More VPN Providers</h3>
-      <p>
+      <ul>
-      <a href="https://thatoneprivacysite.net/vpn-comparison-chart/">
+        <li><a href="https://www.reddit.com/r/privacytoolsIO/comments/43d4zs/you_guys_might_be_interested_in_this_a/">Guide to Choosing the Best VPN</a></li>
-        Spreadsheet with unbiased, independently verifiable data on over 100 VPN services.
+        <li><a href="https://thatoneprivacysite.net/vpn-comparison-chart/">Spreadsheet with unbiased, independently verifiable data on over 100 VPN services.</a></li>
-      </a>
+      </ul>
-      <a href="https://www.reddit.com/r/privacytoolsIO/comments/43d4zs/you_guys_might_be_interested_in_this_a/">
-        (Join the discussion on Reddit)
-      </a>
-      </p>
     </div>
 
     <div class="col-md-6">
@@ -250,8 +265,6 @@
       <h3>Related VPN information</h3>
 
       <ul>
-        <li><a href="https://torrentfreak.com/vpn-services-keep-anonymous-2018/">Which VPN Services Keep You Anonymous in 2018?</a><br />(<strong>Note:</strong> The providers listed first in the TorrentFreaks article are sponsored)</li>
-        <li><a href="https://torrentfreak.com/how-to-make-vpns-even-more-secure-120419/">How To Make VPNs Even More Secure</a></li>
         <li><a href="https://vikingvpn.com/blogs/off-topic/beware-of-vpn-marketing-and-affiliate-programs">Beware of False Reviews - VPN Marketing and Affiliate Programs</a></li>
         <li><a href="https://www.goldenfrog.com/take-back-your-internet/articles/7-myths-about-vpn-logging-and-anonymity">I am Anonymous When I Use a VPN - 7 Myths Debunked</a><br />(<strong>Note:</strong> While this is a good read, they also use the article for self-promotion)</li>
         <li><a href="https://torrentfreak.com/proxy-sh-vpn-provider-monitored-traffic-to-catch-hacker-130930/">Proxy.sh VPN Provider Sniffed Server Traffic to Catch Hacker</a></li>
@@ -260,7 +273,7 @@
         <li><a href="https://medium.com/@blackVPN/no-logs-6d65d95a3016">blackVPN announced to delete connection logs after disconnection</a></li>
         <li><a href="https://gist.github.com/kennwhite/1f3bc4d889b02b35d8aa">Don't use LT2P IPSec, use other protocols.</a></li>
       </ul>
+
     </div>
   </div>
-</div>
+</div>
-

pages/providers.html

@@ -18,7 +18,6 @@ description: "There's a ton of people providing services online. Discover which
     <li class="list-group-item"><a href="/providers/dns/"><i class="fa fa-tasks"></i> Domain Name System (DNS)</a></li>
     <li class="list-group-item"><a href="/providers/search-engines/"><i class="fab fa-searchengin"></i> Privacy Respecting Search Engines</a></li>
     <li class="list-group-item"><a href="/providers/hosting/"><i class="fas fa-database"></i> Secure Hosting Providers</a></li>
-    <li class="list-group-item"><a href="/providers/paste"><i class="fas fa-paste"></i> Paste Services</a></li>
   </ul>
 </div>