From 5f0f482f3564a6dc8ce63804607016562b6c85d0 Mon Sep 17 00:00:00 2001
From: Vincevrp <Vincevrp@users.noreply.github.com>
Date: Sun, 18 Nov 2018 23:26:13 +0100
Subject: [PATCH 1/8] Fix 404 page and add redirect

---
 404.html | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/404.html b/404.html
index c472b4ea..543378fd 100644
--- a/404.html
+++ b/404.html
@@ -2,23 +2,12 @@
 layout: default
 ---
 
-<style type="text/css" media="screen">
-  .container {
-    margin: 10px auto;
-    max-width: 600px;
-    text-align: center;
-  }
-  h1 {
-    margin: 30px 0;
-    font-size: 4em;
-    line-height: 1;
-    letter-spacing: -1px;
-  }
-</style>
-
-<div class="container">
+<div class="container text-center">
   <h1>404</h1>
-
   <p><strong>Page not found :(</strong></p>
-  <p>The requested page could not be found.</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>
 </div>
+
+<script>
+  window.setTimeout(function(){ window.location = "{{ site.url }}"; },5000);
+</script>
-- 
2.49.0


From d423884de5834d55afd092ad6363d3e6fc0fbd8e Mon Sep 17 00:00:00 2001
From: Samuel Shifterovich <Shifterovich@users.noreply.github.com>
Date: Mon, 19 Nov 2018 19:29:44 +0100
Subject: [PATCH 2/8] Update PULL_REQUEST_TEMPLATE.md

---
 .github/PULL_REQUEST_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 1032d75c..90ea4e33 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,7 +2,7 @@
 
 ## Description
 
-Issue: #none
+Resolves: #none <!-- The number of the issue that is resolved by this pull request. If there is none, feel free to delete this line -->
 
 <!--
 ## Screenshots
-- 
2.49.0


From c3ef53c8ab9e58f84c2224504939b2686a419151 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kspearrin@users.noreply.github.com>
Date: Mon, 19 Nov 2018 15:41:40 -0500
Subject: [PATCH 3/8] Update Bitwarden logo and small modifications to
 description (#605)

---
 assets/img/tools/bitwarden.png | Bin 1896 -> 2242 bytes
 index.html                     |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/img/tools/bitwarden.png b/assets/img/tools/bitwarden.png
index 2eb05a715c36bb0c1ecdd155af0ac562faee4ca0..6df4dba49f4b1e30560a6335dd7345407eae5a57 100644
GIT binary patch
literal 2242
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

delta 1892
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

diff --git a/index.html b/index.html
index b6b67675..116e68fa 100644
--- a/index.html
+++ b/index.html
@@ -1475,7 +1475,7 @@ layout: default
   image="assets/img/tools/bitwarden.png"
   url="https://bitwarden.com/"
   footer="OS: Windows, macOS, Linux, iOS, Android, Web."
-  description="Bitwarden is a free and open source password manager. It aims to solve all password management problems for individuals, teams, and business organizations. Bitwarden is among the easiest and safest solutions to store all of your logins and passwords while conveniently keeping them synced between all of your devices. If you don't want to use Bitwarden cloud, you can easily host it on your own server."
+  description="Bitwarden is a free and open source password manager. It aims to solve password management problems for individuals, teams, and business organizations. Bitwarden is among the easiest and safest solutions to store all of your logins and passwords while conveniently keeping them synced between all of your devices. If you don't want to use the Bitwarden cloud, you can easily host your own Bitwarden server."
   %}
 
 </div>
-- 
2.49.0


From 49bd02aa67d75b252f469164d8070b458f1a7a66 Mon Sep 17 00:00:00 2001
From: Vincevrp <Vincevrp@users.noreply.github.com>
Date: Tue, 20 Nov 2018 13:36:56 +0100
Subject: [PATCH 4/8] Fix list and order in KDL

---
 assets/css/style.scss |  5 +++-
 index.html            | 54 ++++++++++++++++++++++++-------------------
 2 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/assets/css/style.scss b/assets/css/style.scss
index f3e2ac26..f5dd4675 100644
--- a/assets/css/style.scss
+++ b/assets/css/style.scss
@@ -21,6 +21,10 @@ a,
   }
 }
 
+.card-ol {
+  padding-left: 1.25rem;
+}
+
 /*.card-success, */
 .card-success {
   .card-header {
@@ -69,7 +73,6 @@ a,
   }
 }
 
-
 .anchor {
   &:target {
     margin-top: -4rem;
diff --git a/index.html b/index.html
index 116e68fa..001ca9c0 100644
--- a/index.html
+++ b/index.html
@@ -65,11 +65,11 @@ layout: default
     {% include panel.html color="danger"
     title="Five Eyes"
     body='
-        1. Australia <div class="float-right"><span class="flag-icon flag-icon-au"></span></div>
-        <br /> 2. Canada <div class="float-right"><span class="flag-icon flag-icon-ca"></span></div>
-        <br /> 3. New Zealand <div class="float-right"><span class="flag-icon flag-icon-nz"></span></div>
-        <br /> 4. United Kingdom <div class="float-right"><span class="flag-icon flag-icon-gb"></span></div>
-        <br /> 5. United States of America <div class="float-right"><span class="flag-icon flag-icon-us"></span></div>
+    <li>1. Australia <div class="float-right"><span class="flag-icon flag-icon-au"></span></div></li>
+    <li>Canada <div class="float-right"><span class="flag-icon flag-icon-ca"></span></div></li>
+    <li>New Zealand <div class="float-right"><span class="flag-icon flag-icon-nz"></span></div></li>
+    <li>United Kingdom <div class="float-right"><span class="flag-icon flag-icon-gb"></span></div></li>
+    <li>United States of America <div class="float-right"><span class="flag-icon flag-icon-us"></span></div></li>
     '
     %}
 
@@ -1566,37 +1566,43 @@ layout: default
     {% include panel.html color="danger"
     title="Key disclosure laws apply"
     body='
-        1. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Antigua_and_Barbuda">Antigua and Barbuda</a> <div class="float-right"><span class="flag-icon flag-icon-ag"></span></div>
-        <br /> 2. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Australia">Australia</a> <div class="float-right"><span class="flag-icon flag-icon-au"></span></div>
-        <br /> 3. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Canada">Canada</a> <div class="float-right"><span class="flag-icon flag-icon-ca"></span></div>
-        <br /> 4. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#France">France</a> <div class="float-right"><span class="flag-icon flag-icon-fr"></span></div>
-        <br /> 5. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#India">India</a> <div class="float-right"><span class="flag-icon flag-icon-in"></span></div>
-		<br /> 6. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Ireland">Ireland</a> <div class="float-right"><span class="flag-icon flag-icon-ie"></span></div>
-        <br /> 7. <a href="https://edri.org/norway-introduces-forced-biometric-authentication/">Norway</a> <div class="float-right"><span class="flag-icon flag-icon-no"></span></div>
-        <br /> 8. <a href="https://www.bloomberg.com/news/articles/2018-03-20/telegram-loses-bid-to-stop-russia-from-getting-encryption-keys">Russia</a> <div class="float-right"><span class="flag-icon flag-icon-ru"></span></div>
-        <br /> 9. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#South_Africa">South Africa</a> <div class="float-right"><span class="flag-icon flag-icon-za"></span></div>
-        <br /> 10. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#United_Kingdom">United Kingdom</a> <div class="float-right"><span class="flag-icon flag-icon-gb"></span></div>
+    <ol class="card-ol">
+      <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Antigua_and_Barbuda">Antigua and Barbuda</a> <div class="float-right"><span class="flag-icon flag-icon-ag"></span></div></li>
+      <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Australia">Australia</a> <div class="float-right"><span class="flag-icon flag-icon-au"></span></div></li>
+      <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Canada">Canada</a> <div class="float-right"><span class="flag-icon flag-icon-ca"></span></div></li>
+      <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#France">France</a> <div class="float-right"><span class="flag-icon flag-icon-fr"></span></div></li>
+      <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#India">India</a> <div class="float-right"><span class="flag-icon flag-icon-in"></span></div></li>
+      <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Ireland">Ireland</a> <div class="float-right"><span class="flag-icon flag-icon-ie"></span></div></li>
+      <li><a href="https://edri.org/norway-introduces-forced-biometric-authentication/">Norway</a> <div class="float-right"><span class="flag-icon flag-icon-no"></span></div></li>
+      <li><a href="https://www.bloomberg.com/news/articles/2018-03-20/telegram-loses-bid-to-stop-russia-from-getting-encryption-keys">Russia</a> <div class="float-right"><span class="flag-icon flag-icon-ru"></span></div></li>
+      <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#South_Africa">South Africa</a> <div class="float-right"><span class="flag-icon flag-icon-za"></span></div></li>
+      <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#United_Kingdom">United Kingdom</a> <div class="float-right"><span class="flag-icon flag-icon-gb"></span></div></li>
+    </ol>
     '
     %}
 
     {% include panel.html color="warning"
     title="Key disclosure laws may apply"
     body='
-        1. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Belgium">Belgium *</a> <div class="float-right"><span class="flag-icon flag-icon-be"></span></div>
-        <br /> 2. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Finland">Finland *</a> <div class="float-right"><span class="flag-icon flag-icon-fi"></span></div>
-        <br /> 3. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#New_Zealand">New Zealand</a> (unclear) <div class="float-right"><span class="flag-icon flag-icon-nz"></span></div>
-        <br /> 4. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Sweden">Sweden</a> (proposed) <div class="float-right"><span class="flag-icon flag-icon-se"></span></div>
-        <br /> 5. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#The_Netherlands">The Netherlands *</a> <div class="float-right"><span class="flag-icon flag-icon-nl"></span></div>
-        <br /> 6. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#United_States">United States</a> (see related information) <div class="float-right"><span class="flag-icon flag-icon-us"></span></div>
+    <ol class="card-ol">
+      <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Belgium">Belgium *</a> <div class="float-right"><span class="flag-icon flag-icon-be"></span></div></li>
+      <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Finland">Finland *</a> <div class="float-right"><span class="flag-icon flag-icon-fi"></span></div></li>
+      <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#New_Zealand">New Zealand</a> (unclear) <div class="float-right"><span class="flag-icon flag-icon-nz"></span></div></li>
+      <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Sweden">Sweden</a> (proposed) <div class="float-right"><span class="flag-icon flag-icon-se"></span></div></li>
+      <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#The_Netherlands">The Netherlands *</a> <div class="float-right"><span class="flag-icon flag-icon-nl"></span></div></li>
+      <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#United_States">United States</a> (see related information) <div class="float-right"><span class="flag-icon flag-icon-us"></span></div></li>
+    </ol>
     '
     %}
 
     {% include panel.html color="success"
     title="Key disclosure laws don't apply"
     body='
-        1. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Czech_Republic">Czech Republic</a> <div class="float-right"><span class="flag-icon flag-icon-cz"></span></div>
-        <br /> 2. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Poland">Poland</a> <div class="float-right"><span class="flag-icon flag-icon-pl"></span></div>
-        <br /> 3. <a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Germany">Germany</a> <div class="float-right"><span class="flag-icon flag-icon-de"></span></div>
+    <ol class="card-ol">
+      <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Czech_Republic">Czech Republic</a> <div class="float-right"><span class="flag-icon flag-icon-cz"></span></div></li>
+      <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Germany">Germany</a> <div class="float-right"><span class="flag-icon flag-icon-de"></span></div></li>
+      <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law#Poland">Poland</a> <div class="float-right"><span class="flag-icon flag-icon-pl"></span></div></li>
+    </ol>
     '
     %}
 
-- 
2.49.0


From 1f041f2f4d1af37dc701c0c1bb7db637d868d8e0 Mon Sep 17 00:00:00 2001
From: privacytoolsIO <privacy@tuta.io>
Date: Wed, 21 Nov 2018 07:27:20 +0800
Subject: [PATCH 5/8] Runbox supports Bitcoin now

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 001ca9c0..0f893ee7 100644
--- a/index.html
+++ b/index.html
@@ -999,7 +999,7 @@ layout: default
             <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="0"><span class="label label-primary">No</span></td>
+            <td data-value="0"><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>
-- 
2.49.0


From c2453e51d667cbf791f48e7c0db1f5f3b94236c9 Mon Sep 17 00:00:00 2001
From: Samuel Shifterovich <Shifterovich@users.noreply.github.com>
Date: Wed, 21 Nov 2018 12:05:23 +0100
Subject: [PATCH 6/8] Fix data-value

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 0f893ee7..7c4df3c9 100644
--- a/index.html
+++ b/index.html
@@ -999,7 +999,7 @@ layout: default
             <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="0"><span class="label label-primary">Yes</span></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>
-- 
2.49.0


From 9aa78c56af13a124d95dcda7ef2a117c3788d0f6 Mon Sep 17 00:00:00 2001
From: privacytoolsIO <privacy@tuta.io>
Date: Thu, 22 Nov 2018 07:42:11 +0800
Subject: [PATCH 7/8] Changed order of PW managers

---
 index.html | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/index.html b/index.html
index 7c4df3c9..8a2ce14b 100644
--- a/index.html
+++ b/index.html
@@ -1453,13 +1453,14 @@ layout: default
 <div class="row mb-2">
 
   {% include card.html color="success"
-  title="LessPass - Browser"
-  image="assets/img/tools/LessPass.png"
-  url="https://lesspass.com/"
-  footer="OS: Windows, macOS, Linux, Android."
-  description="LessPass is a free and open source password manager that generates unique passwords for websites, email accounts, or anything else based on a master password and information you know. No sync needed. Uses PBKDF2 and SHA-256. It's advised to use the browser addons for more security."
+  title="Bitwarden - Cloud/Self-host"
+  image="assets/img/tools/bitwarden.png"
+  url="https://bitwarden.com/"
+  footer="OS: Windows, macOS, Linux, iOS, Android, Web."
+  description="Bitwarden is a free and open source password manager. It aims to solve password management problems for individuals, teams, and business organizations. Bitwarden is among the easiest and safest solutions to store all of your logins and passwords while conveniently keeping them synced between all of your devices. If you don't want to use the Bitwarden cloud, you can easily host your own Bitwarden server."
   %}
 
+
   {% include card.html color="primary"
   title="KeePass / KeePassX - Local"
   image="assets/img/tools/KeePass.png"
@@ -1471,13 +1472,14 @@ layout: default
   %}
 
   {% include card.html color="warning"
-  title="Bitwarden - Cloud/Self-host"
-  image="assets/img/tools/bitwarden.png"
-  url="https://bitwarden.com/"
-  footer="OS: Windows, macOS, Linux, iOS, Android, Web."
-  description="Bitwarden is a free and open source password manager. It aims to solve password management problems for individuals, teams, and business organizations. Bitwarden is among the easiest and safest solutions to store all of your logins and passwords while conveniently keeping them synced between all of your devices. If you don't want to use the Bitwarden cloud, you can easily host your own Bitwarden server."
+  title="LessPass - Browser"
+  image="assets/img/tools/LessPass.png"
+  url="https://lesspass.com/"
+  footer="OS: Windows, macOS, Linux, Android."
+  description="LessPass is a free and open source password manager that generates unique passwords for websites, email accounts, or anything else based on a master password and information you know. No sync needed. Uses PBKDF2 and SHA-256. It's advised to use the browser addons for more security."
   %}
 
+
 </div>
 <h3>Worth Mentioning</h3>
 <ul>
-- 
2.49.0


From e0e91b10a9303de821e3ac06403b3002e8209ee3 Mon Sep 17 00:00:00 2001
From: Vincevrp <Vincevrp@users.noreply.github.com>
Date: Sun, 18 Nov 2018 23:40:25 +0100
Subject: [PATCH 8/8] Replace Google+ share button with Mastodon

---
 _layouts/default.html | 2 +-
 _sass/_vars.scss      | 2 +-
 assets/css/style.scss | 2 +-
 index.html            | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/_layouts/default.html b/_layouts/default.html
index 138eabfb..0d6ad38a 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -155,7 +155,7 @@
                 <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="https://plus.google.com/share?url=https://www.privacytools.io">Google+</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>
diff --git a/_sass/_vars.scss b/_sass/_vars.scss
index 05ddef71..a331de68 100644
--- a/_sass/_vars.scss
+++ b/_sass/_vars.scss
@@ -17,7 +17,7 @@ $share-btn-active:    #e2e2e2;
 
 /* Social */
 $twitter:             #55acee;
-$google:              #dd4b39;
+$mastodon:            #3088d4;
 $facebook:            #3b5998;
 $stumbleupon:         #eb4823;
 $reddit:              #ff5700;
diff --git a/assets/css/style.scss b/assets/css/style.scss
index f3e2ac26..447a756c 100644
--- a/assets/css/style.scss
+++ b/assets/css/style.scss
@@ -111,7 +111,7 @@ a,
 }
 
 .twitter { background: $twitter; }
-.google-plus { background: $google; }
+.mastodon { background: $mastodon; }
 .facebook { background: $facebook; }
 .stumbleupon { background: $stumbleupon; }
 .reddit { background: $reddit; }
diff --git a/index.html b/index.html
index b6b67675..238757ca 100644
--- a/index.html
+++ b/index.html
@@ -2252,8 +2252,8 @@ This tool uses some known methods that attempt to disable major tracking feature
         <i class="fab fa-twitter"></i>
     </a>
 
-    <a href="https://plus.google.com/share?url=https://www.privacytools.io" class="share-btn google-plus" title="Google+">
-        <i class="fab fa-google-plus-g"></i>
+    <a href="http://sharetomastodon.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url=https://www.privacytools.io" class="share-btn mastodon" title="Mastodon">
+      <i class="fab fa-mastodon"></i>
     </a>
 </div>
 <div class="col-12 col-md-6 d-flex justify-content-between">
-- 
2.49.0