Merge branch 'master' into Source_Code

.github/CONTRIBUTING.md

@@ -1 +1,28 @@
-Please refer to the **Contributing** and **Contributing Guidelines** sections of our [readme](https://github.com/privacytoolsIO/privacytools.io/blob/master/README.md) for the most up-to-date guidelines. Thank you.
+# Contributing Guidelines
+
+Please read this before contributing.
+
+## Rules
+
+- Be nice and respectful.
+- English only.
+- Be constructive.
+
+## Quality over Quantity
+
+We're trying to keep it simple and promote the best tools, not all of them. Maximum are three software choices, but it's possible to add more under "Worth Mentioning" headlines. ([example](https://www.privacytools.io/#im))
+
+## Software Criteria
+
+- Open Source
+- Cross-platform
+- Easy to use
+- Privacy respecting
+
+There can be exceptions if no software is available that meet the criteria.
+
+## Images
+
+- Provider logos should be exactly 200 x 70 ([example](https://www.privacytools.io/assets/img/provider/AirVPN.png))
+- Tool logos should be exactly 120 x 120 ([example](https://www.privacytools.io/assets/img/tools/ChatSecure.png))
+

.github/ISSUE_TEMPLATE/1_Software_Suggestion.md

@@ -0,0 +1,14 @@
+---
+name: "🆕 Software Suggestion"
+about: Suggest new software that enhances privacy.
+title: "🆕 Software Suggestion | "
+labels: 🆕 software suggestion
+---
+
+## Basic Information
+
+**Name:**
+**Category:**
+**URL:**
+
+## Description

.github/ISSUE_TEMPLATE/2_Software_Removal.md

@@ -0,0 +1,9 @@
+---
+name: "❌ Software Removal"
+about: Suggest the removal of outdated, insecure, or otherwise bad software.
+title: "❌ Software Removal | "
+labels: ❌ software removal
+---
+
+## Description
+

.github/ISSUE_TEMPLATE/3_Discussion.md

@@ -0,0 +1,8 @@
+---
+name: "💬 Discussion"
+about: Discuss the website or any mentioned software in general.
+title: "💬 Discussion | "
+labels: 💬 discussion, feedback wanted
+---
+
+<!-- Remember to stay civil! -->

.github/ISSUE_TEMPLATE/4_Feature.md

@@ -0,0 +1,9 @@
+---
+name: "✨ Feature Suggestion"
+about: Suggest a new feature for the website.
+title: "✨ Feature Suggestion | "
+labels: ✨ enhancement
+---
+
+## Description:
+

.github/ISSUE_TEMPLATE/5_Website_Issues.md

@@ -0,0 +1,14 @@
+---
+name: "🌐 Website Issue"
+about: Report an issue with the website.
+title: "🌐 Website Issue | "
+labels: 🌐 website issue, high priority
+---
+
+## Description
+
+<!--
+## Screenshots
+
+Please add screenshots if applicable
+-->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
-<!-- PLEASE READ OUR [CONTRIBUTING GUIDELINES](https://github.com/privacytoolsIO/privacytools.io#contributing-guidelines) BEFORE SUBMITTING -->
+<!-- PLEASE READ OUR [CONTRIBUTING GUIDELINES](https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md) BEFORE SUBMITTING -->
 
 ## Description
 

.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+rvm:
+  - 2.4.1
+
+# Assume bundler is being used, therefore
+# the `install` step will run `bundle install` by default.
+script: ./build.sh
+
+sudo: false # route your build to the container-based infrastructure for a faster build
+
+cache: bundler # caching bundler gem packages will speed up build

404.html

@@ -6,7 +6,7 @@ active_page: 404
 <div class="container text-center">
   <h1>404</h1>
   <p><strong>Page not found :(</strong></p>
-  <p>We're redirecting you to the home page in 5 seconds. It this doesn't work, <a href="{{ site.url }}">click here.</a></p>
+  <p>We're redirecting you to the home page in 5 seconds. If this doesn't work, <a href="{{ site.url }}">click here.</a></p>
 </div>
 
 <script>

README.md

@@ -2,45 +2,22 @@
 
 _Encryption Against Global Mass Surveillance._
 
+[![Build Status](https://travis-ci.com/privacytoolsIO/privacytools.io.svg?branch=master)](https://travis-ci.com/privacytoolsIO/privacytools.io)
+
 # Contributing
 
 It's important for a website like privacytools.io to be up-to-date. Keep an eye on software updates of the applications listed here. Follow recent news about providers that are recommended. We try our best to keep up but we're not perfect and the internet is changing fast. So 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.** Join our [subreddit](https://www.reddit.com/r/privacytoolsIO/) and start a discussion. This is a community project and we're aiming to deliver the best information available for a better privacy. We are also using [/r/privacy](https://www.reddit.com/r/privacy). Thank you for participating.
 
-You can submit your suggestions here on GitHub [(Issues)](https://github.com/privacytoolsIO/privacytools.io/issues) and also in our [subreddit](https://www.reddit.com/r/privacytoolsIO/). Thank you.
+You can submit your suggestions here on GitHub [(Issues)](https://github.com/privacytoolsIO/privacytools.io/issues) and also in our [subreddit](https://www.reddit.com/r/privacytoolsIO/). Please refer to the [Contributing Guidelines](.github/CONTRIBUTING.md) before submitting. Thank you.
 
 ## Building
-1. Install Ruby
-2. `bundle install`
-3. `bundle exec jekyll serve` # Live refresh.
 
-# Contributing Guidelines
+1. Install [Ruby](https://www.ruby-lang.org/en/documentation/installation/)
-Please read this before contributing.
+1. Install [bundler](https://bundler.io/) by running `gem install bundler`.
-
+1. Run `bundle install` to install the required dependencies.
-## Rules
+1. Use `bundle exec jekyll build` to build the website. The output can be found in the `_site` directory.  Live preview is also possible by running `bundle exec jekyll serve`
-
-- Be nice and respectful.
-- English only.
-- Be constructive.
-
-## Quality over Quantity
-
-We're trying to keep it simple and promote the best tools, not all of them. Maximum are three software choices, but it's possible to add more under "Worth Mentioning" headlines. ([example](https://privacytoolsio.github.io/privacytools.io/#im))
-
-## Software Criteria
-
-- Open Source
-- Cross-platform
-- Easy to use
-- Privacy respecting
-
-There can be exceptions if no software is available that meet the criteria.
-
-## Images
-
-- Provider logos should be exactly 200 x 70 ([example](https://www.privacytools.io/assets/img/provider/AirVPN.gif))
-- Tool logos should be exactly 120 x 120 ([example](https://www.privacytools.io/assets/img/tools/ChatSecure.png))
 
 # Support privacytools.io
 

_config.yml

@@ -3,4 +3,7 @@ description: You are being watched! Knowledge, encryption and privacy tools to p
 url: "https://privacytools.io"
 sass:
   style: compressed
-
+plugins:
+  - jekyll-sitemap
+sitemap:
+file: "/sitemap.xml"

_includes/card.html

@@ -15,14 +15,21 @@
                     {% assign label_data = label | split:":" %}
                     {% assign color = label_data[0] %}
                     {% assign text = label_data[1] %}
-                    <span class="badge badge-{{color}}">{{text}}</span>
+                    {% assign tooltip = label_data[2] | default: "" %}
+                    {% assign help_icon = '<i class="far fa-question-circle"></i>' %}
+                    <span class="badge badge-{{color}}" {% if tooltip %} data-toggle="tooltip" title="{{ tooltip }}">{{text}} {{ help_icon
+                        }}
+                        {% else %}
+                        >{{text}}
+                        {% endif %}
+                    </span>
                 {% endfor %}
             </div>
             {% endif %}
             <p><img src="{{include.image}}" alt="{{include.title}}" class="panel-item">{{include.description}}</p>
             <div>
             <p>
-                <a class="btn btn-{{include.color}} mb-1" href="{{include.url}}">Website: 
+                <a class="btn btn-{{include.color}} mb-1" href="{{include.url}}">Website:
                     {% if include.website %}
                         {{include.website}}
                     {% else %}

_layouts/default.html

@@ -66,126 +66,104 @@
 <!-- navigation starts -->
 
 <nav id="navbar" class="navbar fixed-top navbar-expand-lg navbar-dark bg-dark">
-<div class="container">
+  <div class="container">
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
+      <span class="navbar-toggler-icon"></span>
     </button>
 
     <div class="collapse navbar-collapse" id="navbarSupportedContent">
-        <ul class="navbar-nav mr-auto">
+      <ul class="navbar-nav mr-auto">
         {% assign prefix = "" %}
         {% if page.active_page %}
-            {% assign prefix = "index.html" %}
+        {% assign prefix = "index.html" %}
         {% endif %}
         <li class="nav-item">
-            <a class="nav-link" href="{{prefix}}#top"><i class="fas fa-home"></i> <span class="sr-only">Home</span></a>
+          <a class="nav-link" href="{{prefix}}#top"><i class="fas fa-home"></i> <span class="sr-only">Home</span></a>
         </li>
         <li class="nav-item dropdown">
-            <a class="nav-link dropdown-toggle" href="#" id="providerDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          <a class="nav-link dropdown-toggle" href="#" id="providerDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             Provider
-            </a>
+          </a>
-            <div class="dropdown-menu" aria-labelledby="providerDropdown">
+          <div class="dropdown-menu" aria-labelledby="providerDropdown">
-            <a class="dropdown-item" href="{{prefix}}#ukusa">Avoid all US and UK based services</a>
+            <a class="dropdown-item" href="{{prefix}}#ukusa"><i class="fab fa-creative-commons-nc"></i> Avoid all US and UK based services</a>
-            <a class="dropdown-item" href="{{prefix}}#vpn">Virtual Private Network (VPN)</a>
+            <a class="dropdown-item" href="{{prefix}}#vpn"><i class="far fa-eye-slash"></i> Virtual Private Network (VPN)</a>
-            <a class="dropdown-item" href="{{prefix}}#email">Privacy Email</a>
+            <a class="dropdown-item" href="{{prefix}}#email"><i class="fas fa-mail-bulk"></i> Privacy Email</a>
-            <a class="dropdown-item" href="{{prefix}}#wc">Warrant Canaries</a>
+            <a class="dropdown-item" href="{{prefix}}#wc"><i class="fa fa-exclamation-circle"></i> Warrant Canaries</a>
-            <a class="dropdown-item" href="{{prefix}}#cloud">Encrypted Cloud Storage Services</a>
+            <a class="dropdown-item" href="{{prefix}}#cloud"><i class="fas fa-cloud"></i> Encrypted Cloud Storage Services</a>
-            <a class="dropdown-item" href="{{prefix}}#social">Decentralized Social Networks</a>
+            <a class="dropdown-item" href="{{prefix}}#social"><i class="fas fa-expand-arrows-alt"></i> Decentralized Social Networks</a>
-            <a class="dropdown-item" href="{{prefix}}#dns">Domain Name System (DNS)</a>
+            <a class="dropdown-item" href="{{prefix}}#dns"><i class="fa fa-tasks"></i> Domain Name System (DNS)</a>
-            <a class="dropdown-item" href="{{prefix}}#search">Privacy Respecting Search Engines</a>
+            <a class="dropdown-item" href="{{prefix}}#search"><i class="fab fa-searchengin"></i> Privacy Respecting Search Engines</a>
-            </div>
+            <a class="dropdown-item" href="{{prefix}}#host"><i class="fas fa-database"></i> Secure Hosting Providers</a>
+          </div>
         </li>
         <li class="nav-item dropdown">
-            <a class="nav-link dropdown-toggle" href="#" id="browserDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          <a class="nav-link dropdown-toggle" href="#" id="browserDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Browser
+            Browser
-            </a>
+          </a>
-            <div class="dropdown-menu" aria-labelledby="browserDropdown">
+          <div class="dropdown-menu" aria-labelledby="browserDropdown">
-                <a class="dropdown-item" href="{{prefix}}#browser">Recommendation</a>
+            <a class="dropdown-item" href="{{prefix}}#browser"><i class="fas fa-check"></i> Recommendation</a>
-                <a class="dropdown-item" href="{{prefix}}#fingerprint">Fingerprint</a>
+            <a class="dropdown-item" href="{{prefix}}#fingerprint"><i class="fas fa-fingerprint"></i> Fingerprint</a>
-                <a class="dropdown-item" href="{{prefix}}#webrtc">WebRTC IP Leak</a>
+            <a class="dropdown-item" href="{{prefix}}#webrtc"><i class="far fa-eye"></i> WebRTC IP Leak</a>
-                <a class="dropdown-item" href="{{prefix}}#addons">Firefox Privacy Add-ons</a>
+            <a class="dropdown-item" href="{{prefix}}#addons"><i class="far fa-list-alt"></i> Firefox Privacy Add-ons</a>
-                <a class="dropdown-item" href="{{prefix}}#about_config">Privacy Related Tweaks</a>
+            <a class="dropdown-item" href="{{prefix}}#about_config"><i class="fas fa-wrench"></i> Privacy Related Tweaks</a>
-            </div>
+          </div>
         </li>
         <li class="nav-item dropdown">
-            <a class="nav-link dropdown-toggle" href="#" id="softwareDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          <a class="nav-link dropdown-toggle" href="#" id="softwareDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                Software
+            Software
-            </a>
+          </a>
-            <div class="dropdown-menu" aria-labelledby="softwareDropdown">
+          <div class="dropdown-menu" aria-labelledby="softwareDropdown">
-                <a class="dropdown-item" href="{{prefix}}#clients">Email Clients</a>
+            <a class="dropdown-item" href="{{prefix}}#clients"><i class="fas fa-envelope"></i> Email Clients</a>
-                <a class="dropdown-item" href="{{prefix}}#messaging">Email Alternatives</a>
+            <a class="dropdown-item" href="{{prefix}}#messaging"><i class="fas fa-random"></i> Email Alternatives</a>
-                <a class="dropdown-item" href="{{prefix}}#search">Search Engines</a>
+            <a class="dropdown-item" href="{{prefix}}#im"><i class="fab fa-telegram-plane"></i> Instant Messenger</a>
-                <a class="dropdown-item" href="{{prefix}}#im">Instant Messenger</a>
+            <a class="dropdown-item" href="{{prefix}}#voip"><i class="fas fa-phone"></i> Video & Voice Messenger</a>
-                <a class="dropdown-item" href="{{prefix}}#voip">Video & Voice Messenger</a>
+            <a class="dropdown-item" href="{{prefix}}#filesharing"><i class="fas fa-file-export"></i> File Sharing</a>
-                <a class="dropdown-item" href="{{prefix}}#filesharing">File Sharing</a>
+            <a class="dropdown-item" href="{{prefix}}#mycloud"><i class="fas fa-hdd"></i> Self-Hosted Cloud Server</a>
-                <a class="dropdown-item" href="{{prefix}}#cloud">Encrypted Cloud Storage</a>
+            <a class="dropdown-item" href="{{prefix}}#sync"><i class="fas fa-copy"></i> Secure File Sync</a>
-                <a class="dropdown-item" href="{{prefix}}#mycloud">Self-Hosted Cloud Server</a>
+            <a class="dropdown-item" href="{{prefix}}#pw"><i class="fas fa-user-lock"></i> Password Manager</a>
-                <a class="dropdown-item" href="{{prefix}}#sync">Secure File Sync</a>
+            <a class="dropdown-item" href="{{prefix}}#calendar_contacts"><i class="far fa-calendar-alt"></i> Calendar and Contacts Sync</a>
-                <a class="dropdown-item" href="{{prefix}}#pw">Password Manager</a>
+            <a class="dropdown-item" href="{{prefix}}#encrypt"><i class="fas fa-lock"></i> File Encryption</a>
-                <a class="dropdown-item" href="{{prefix}}#calendar_contacts">Calendar and Contacts Sync</a>
+            <a class="dropdown-item" href="{{prefix}}#darknets"><i class="fas fa-user-secret"></i> Self-contained Networks</a>
-                <a class="dropdown-item" href="{{prefix}}#encrypt">File Encryption</a>
+            <a class="dropdown-item" href="{{prefix}}#notebook"><i class="far fa-sticky-note"></i> Digital Notebook</a>
-                <a class="dropdown-item" href="{{prefix}}#darknets">Self-contained Networks</a>
+            <a class="dropdown-item" href="{{prefix}}#paste"><i class="fas fa-paste"></i> Paste Services</a>
-                <a class="dropdown-item" href="{{prefix}}#social">Social Networks</a>
+            <a class="dropdown-item" href="{{prefix}}#productivity"><i class="fas fa-briefcase"></i> Productivity Tools</a>
-                <a class="dropdown-item" href="{{prefix}}#dns">DNS</a>
+            <a class="dropdown-item" href="/source_code">Source Code</a>
-                <a class="dropdown-item" href="{{prefix}}#notebook">Digital Notebook</a>
+          </div>
-                <a class="dropdown-item" href="{{prefix}}#paste">Paste Services</a>
-                <a class="dropdown-item" href="{{prefix}}#productivity">Productivity Tools</a>
-                <a class="dropdown-item" href="{{prefix}}#win10">Don't use Windows 10</a>
-                <a class="dropdown-item" href="https://www.privacytools.io/source_code.md/">Source Code</a>
-            </div>
         </li>
         <li class="nav-item dropdown">
-            <a class="nav-link dropdown-toggle" href="#" id="osDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          <a class="nav-link dropdown-toggle" href="#" id="osDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                OS
+            OS
-            </a>
+          </a>
-            <div class="dropdown-menu" aria-labelledby="osDropdown">
+          <div class="dropdown-menu" aria-labelledby="osDropdown">
-                <a class="dropdown-item" href="{{prefix}}#os">PC OS</a>
+            <a class="dropdown-item" href="{{prefix}}#os"><i class="fas fa-th-large"></i> PC OS</a>
-                <a class="dropdown-item" href="{{prefix}}#live_os">Live CD OS</a>
+            <a class="dropdown-item" href="{{prefix}}#live_os"><i class="fas fa-compact-disc"></i> Live CD OS</a>
-                <a class="dropdown-item" href="{{prefix}}#mobile_os">Mobile OS</a>
+            <a class="dropdown-item" href="{{prefix}}#mobile_os"><i class="fas fa-mobile-alt"></i> Mobile OS</a>
-                <a class="dropdown-item" href="{{prefix}}#aaddons">Android Privacy Add-ons</a>
+            <a class="dropdown-item" href="{{prefix}}#aaddons"><i class="fas fa-th"></i> Android Privacy Add-ons</a>
-                <a class="dropdown-item" href="{{prefix}}#firmware">Router Firmware</a>
+            <a class="dropdown-item" href="{{prefix}}#firmware"><i class="fas fa-signal"></i> Router Firmware</a>
-            </div>
+            <a class="dropdown-item" href="{{prefix}}#win10"><i class="far fa-thumbs-down"></i> Don't use Windows 10</a>
+          </div>
         </li>
         <li class="nav-item">
-            <a class="nav-link" href="#participate">Participate</a>
+          <a class="nav-link" href="#participate">Participate</a>
         </li>
-        <li class="nav-item dropdown">
+      </ul>
-            <a class="nav-link dropdown-toggle" href="#" id="shareDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+      <ul class="navbar-nav">
-                Share
-            </a>
-            <div class="dropdown-menu" aria-labelledby="shareDropdown">
-                <a class="dropdown-item" href="mailto:?subject=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&body=https://www.privacytools.io/">Email</a>
-                <a class="dropdown-item" href="https://www.facebook.com/sharer/sharer.php?u=https://www.privacytools.io">Facebook</a>
-                <a class="dropdown-item" href="https://twitter.com/share?text=Knowledge%20and%20tools%20to%20protect%20your%20privacy%20against%20global%20mass%20surveillance%20&amp;url=https://www.privacytools.io/&amp;via=privacytoolsIO">Twitter</a>
-                <a class="dropdown-item" href="http://sharetomastodon.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url=https://www.privacytools.io">Mastodon</a>
-                <a class="dropdown-item" href="http://reddit.com/submit?url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance">reddit</a>
-                <a class="dropdown-item" href="https://www.linkedin.com/shareArticle?url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance">LinkedIn</a>
-                <a class="dropdown-item" href="http://www.stumbleupon.com/submit?url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance">StumbleUpon</a>
-                <a class="dropdown-item" href="http://sharetodiaspora.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url=https://www.privacytools.io">Diaspora*</a>
-            </div>
-        </li>
-        <li class="nav-item">
-            <a class="nav-link" href="https://twitter.com/privacytoolsIO">Twitter</a>
-        </li>
-        </ul>
-        <ul class="navbar-nav">
         {% if page.active_page == "donate" %}
-            <li class="nav-item active">
+        <li class="nav-item active">
-                <a class="nav-link" href="#">Donate <i class="fas fa-heart text-danger"></i></a>
+          <a class="nav-link" href="#">Donate <i class="fas fa-heart text-danger"></i></a>
-            </li>
+        </li>
         {% else %}
-            <li class="nav-item">
+        <li class="nav-item">
-                <a class="nav-link" href="donate.html">Donate <i class="fas fa-heart text-danger"></i></a>
+          <a class="nav-link" href="donate.html">Donate <i class="fas fa-heart text-danger"></i></a>
-            </li>
+        </li>
         {% endif %}
-        </ul>
+      </ul>
     </div>
-</div>
+  </div>
 </nav>
 <!-- navigation ends here -->
 
-<div class="py-4">
+<div id="top" class="py-4">
-<h1 id="top"></h1>
 <div class="mb-5"></div>
 {{ content }}
 </div>

build.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set -e # halt script on error
+
+bundle exec jekyll build

donate.html

@@ -2,55 +2,31 @@
 layout: default
 active_page: donate
 ---
-
 <div class="col-12">
-<div class="row">
+  <div class="row">
-<div class="mx-auto text-center">
+    <div class="mx-auto text-center">
-
+      <div class="mt-4 mb-4">
-<br>
+        <a href="https://www.privacytools.io/"><img src="assets/img/layout/logo_smaller.png" class="img-fluid" alt="privacytools.io"></a>
-
+      </div>
-<p>
+      <h1>Please Donate</h1>
-	<a href="https://www.privacytools.io/"><img src="assets/img/layout/logo_smaller.png" class="img-fluid" alt="privacytools.io"></a>
+      <p>Our website is free of advertisement and not affiliated with any listed providers.<br>Your donation will cover our cost for server, domains, coffee, beer and pizza.</p>
-</p>
+      <h2>Bitcoin:</h2>
-
+      <a href="bitcoin:1N4bKCx3kpvUTBhsvbmthPDssN8ATPEhgt?message=privacytools.io%20(Coffee,%20Beer%20and%20Pizza)" target="_blank">
-
+        <img src="assets/img/layout/qr.png">
-<h1>Please Donate</h1>
+      </a>
-
+      </p>
-<p>
+      <div class="form-group">
-	Our website is free of advertisement and not affiliated with any listed providers.<br/>
+        <input id="address" type="text" value="1N4bKCx3kpvUTBhsvbmthPDssN8ATPEhgt" onclick="this.focus();this.select()" class="form-control text-center">
-	Your donation will cover our cost for server, domains, coffee, beer and pizza.
+        <label for="address">For easy copy and paste. <a href="bitcoin:1N4bKCx3kpvUTBhsvbmthPDssN8ATPEhgt?message=privacytools.io%20(Coffee,%20Beer%20and%20Pizza)">Or use this link.</a></label>
-</p>
+      </div>
-
+      </p>
-<p>
+      <p>
-	<h2>Bitcoin:</h2>
+      <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=5G9CBU8P6F4K2" target="_blank"><img src="assets/img/layout/PayPal.png"></a>
-
+      </p>
-<p>
+      <h3>Thanks for your support. You are awesome!</h3>
-	<a href="bitcoin:1N4bKCx3kpvUTBhsvbmthPDssN8ATPEhgt?message=privacytools.io%20(Coffee,%20Beer%20and%20Pizza)" target="_blank"><img src="assets/img/layout/qr.png"></a>	
+      <p>
-</p>	
+      <img src="assets/img/misc/smile.png" class="img-fluid" alt="Smile">
-
+      </p>
-<div class="form-group">
+    </div>
-	<input id="address" type="text" value="1N4bKCx3kpvUTBhsvbmthPDssN8ATPEhgt" onclick="this.focus();this.select()" class="form-control text-center">
+  </div>
-	<label for="address">For easy copy and paste. <a href="bitcoin:1N4bKCx3kpvUTBhsvbmthPDssN8ATPEhgt?message=privacytools.io%20(Coffee,%20Beer%20and%20Pizza)">Or use this link.</a></label>
-</div>	
-
-</p>
-
-<br>
-
-<p>
-	<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=5G9CBU8P6F4K2" target="_blank"><img src="assets/img/layout/PayPal.png"></a>
-</p>
-
-
-
-
-	<h3>Thanks for your support. You are awesome!</h3>
-
-
-<p>
-	<img src="assets/img/misc/smile.png" class="img-fluid" alt="Smile">
-</p>
-
 </div>
-</div>
-</div>

password.html

@@ -0,0 +1 @@
+<meta http-equiv="Refresh" content="0; url=index.html#pw" />

robots.txt

@@ -1,5 +1,3 @@
-# www.robotstxt.org/
-
-# Allow crawling of all content
 User-agent: *
-Disallow:
+Allow: /
+Sitemap: https://privacytools.io/sitemap.xml

webrtc.html

@@ -1,141 +0,0 @@
----
-layout: default
-active_page: webrtc
----
-
-<div class="col-12">
-<div class="row">
-<div class="mx-auto text-center">
-
-<h1><a href="https://www.privacytools.io/"><img src="assets/img/layout/logo.png" class="img-responsive" alt="privacytools.io"></a></h1>
-
-<h2>WebRTC IP Leak VPN / Tor IP Test</h2>
-
-<p>
-	WebRTC is a communication protocol that relies on JavaScript that can leak your actual IP address from behind your VPN. While software like NoScript prevents this, it's probably a good idea to block this protocol directly as well, just to be safe. This page will test if your internet browser is affected by the <strong>WebRTC Leak.</strong>
-</p>
-
-<p>
-This demo secretly makes requests to STUN servers that can log your
-request. These requests do not show up in developer consoles and
-cannot be blocked by browser plugins like AdBlock, Ghostery, etc.
-</p>
-
-<p>&nbsp;</p>
-<strong>Your local IP addresses:</strong>
-<ul></ul>
-<strong>Your public IP addresses:</strong>
-<ul></ul>
-
-<p>&nbsp;</p>
-
-<p>Your browser is not safe and will show your real IP even though you are using a VPN service if you can see your real IP addresses here.</p>
-
-<p><strong><a href="https://www.privacytools.io/#webrtc">How to fix the WebRTC Leak?</a></strong></p>
-
-<p>&nbsp;</p>
-
-<p>Source Code: <a href="https://github.com/diafygi/webrtc-ips" target="_blank">GitHub</a>
-<br>Script Version: Jul 20, 2015</a></p>
-
-        <iframe id="iframe" sandbox="allow-same-origin" style="display: none"></iframe>
-        <script>
-            //get the IP addresses associated with an account
-            function getIPs(callback){
-                var ip_dups = {};
-
-                //compatibility for firefox and chrome
-                var RTCPeerConnection = window.RTCPeerConnection
-                    || window.mozRTCPeerConnection
-                    || window.webkitRTCPeerConnection;
-                var useWebKit = !!window.webkitRTCPeerConnection;
-
-                //bypass naive webrtc blocking using an iframe
-                if(!RTCPeerConnection){
-                    //NOTE: you need to have an iframe in the page right above the script tag
-                    //
-                    //<iframe id="iframe" sandbox="allow-same-origin" style="display: none"></iframe>
-                    //<script>...getIPs called in here...
-                    //
-                    var win = iframe.contentWindow;
-                    RTCPeerConnection = win.RTCPeerConnection
-                        || win.mozRTCPeerConnection
-                        || win.webkitRTCPeerConnection;
-                    useWebKit = !!win.webkitRTCPeerConnection;
-                }
-
-                //minimal requirements for data connection
-                var mediaConstraints = {
-                    optional: [{RtpDataChannels: true}]
-                };
-
-                var servers = {iceServers: [{urls: "stun:stun.services.mozilla.com"}]};
-
-                //construct a new RTCPeerConnection
-                var pc = new RTCPeerConnection(servers, mediaConstraints);
-
-                function handleCandidate(candidate){
-                    //match just the IP address
-                    var ip_regex = /([0-9]{1,3}(\.[0-9]{1,3}){3}|[a-f0-9]{1,4}(:[a-f0-9]{1,4}){7})/
-                    var ip_addr = ip_regex.exec(candidate)[1];
-
-                    //remove duplicates
-                    if(ip_dups[ip_addr] === undefined)
-                        callback(ip_addr);
-
-                    ip_dups[ip_addr] = true;
-                }
-
-                //listen for candidate events
-                pc.onicecandidate = function(ice){
-
-                    //skip non-candidate events
-                    if(ice.candidate)
-                        handleCandidate(ice.candidate.candidate);
-                };
-
-                //create a bogus data channel
-                pc.createDataChannel("");
-
-                //create an offer sdp
-                pc.createOffer(function(result){
-
-                    //trigger the stun server request
-                    pc.setLocalDescription(result, function(){}, function(){});
-
-                }, function(){});
-
-                //wait for a while to let everything done
-                setTimeout(function(){
-                    //read candidate info from local description
-                    var lines = pc.localDescription.sdp.split('\n');
-
-                    lines.forEach(function(line){
-                        if(line.indexOf('a=candidate:') === 0)
-                            handleCandidate(line);
-                    });
-                }, 1000);
-            }
-
-            //insert IP addresses into the page
-            getIPs(function(ip){
-                var li = document.createElement("li");
-                li.textContent = ip;
-
-                //local IPs
-                if (ip.match(/^(192\.168\.|169\.254\.|10\.|172\.(1[6-9]|2\d|3[01]))/))
-                    document.getElementsByTagName("ul")[0].appendChild(li);
-
-                //IPv6 addresses
-                else if (ip.match(/^[a-f0-9]{1,4}(:[a-f0-9]{1,4}){7}$/))
-                    document.getElementsByTagName("ul")[2].appendChild(li);
-
-                //assume the rest are public IPs
-                else
-                    document.getElementsByTagName("ul")[1].appendChild(li);
-            });
-        </script>
-
-</div>
-</div>
-</div>