From 37da7f1ef38f8d91cfe12de76e410b08beb0d768 Mon Sep 17 00:00:00 2001
From: James Kerrane <hi@jameskerrane.com>
Date: Mon, 3 May 2021 21:34:39 -0600
Subject: [PATCH] Remove dead links, update info about mentioned companies
 (#2235)

---
 _includes/sections/hosting-provider.html | 2 +-
 _includes/sections/warrant-canary.html   | 2 --
 pages/providers/vpn.html                 | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/_includes/sections/hosting-provider.html b/_includes/sections/hosting-provider.html
index bc1bd67e..18fb029d 100644
--- a/_includes/sections/hosting-provider.html
+++ b/_includes/sections/hosting-provider.html
@@ -14,7 +14,7 @@
   title="VPS & Domain: Njalla"
   image="/assets/img/svg/3rd-party/njalla.svg"
   image-dark="/assets/img/svg/3rd-party/njalla-dark.svg"
-  description="Njalla is a privacy-aware domain registration service and VPS provider based in Nevis (with VPS data centers in Sweden). It is created by people from The Pirate Bay and IPredator VPN. Accepted payments: Bitcoin, Litecoin, Monero, Zcash, DASH, Bitcoin Cash and PayPal."
+  description="Njalla is a privacy-aware domain registration service and VPS provider based in Nevis (with VPS data centers in Sweden). It is created by people from The Pirate Bay and the now merged IPredator VPN. Accepted payments: Bitcoin, Litecoin, Monero, Zcash, DASH, Ethereum, Bitcoin Cash and PayPal."
   website="https://njal.la/"
   labels="color==warning::link==https://github.com/privacytools/privacytools.io/issues/1920::text==Warning::tooltip==Njalla blocks port 25 traffic."
   tor="http://njalladnspotetti.onion"
diff --git a/_includes/sections/warrant-canary.html b/_includes/sections/warrant-canary.html
index 057f3957..a3bdce1e 100644
--- a/_includes/sections/warrant-canary.html
+++ b/_includes/sections/warrant-canary.html
@@ -7,10 +7,8 @@
 <h4>Warrant Canary Examples:</h4>
 
 <ol>
-  <li><a href="https://proxy.sh/canary">https://proxy.sh/canary</a></li>
   <li><a href="https://www.ivpn.net/resources/canary.txt">https://www.ivpn.net/resources/canary.txt</a></li>
   <li><a href="https://www.bolehvpn.net/canary.txt">https://www.bolehvpn.net/canary.txt</a></li>
-  <li><a href="https://www.ipredator.se/static/downloads/canary.txt">https://www.ipredator.se/static/downloads/canary.txt</a></li>
 </ol>
 
 <h4>Related Warrant Canary Information</h4>
diff --git a/pages/providers/vpn.html b/pages/providers/vpn.html
index d8de6dee..4da7f6b0 100644
--- a/pages/providers/vpn.html
+++ b/pages/providers/vpn.html
@@ -224,7 +224,6 @@ breadcrumb: "VPN"
           <li><a href="https://blog.privacytools.io/the-trouble-with-vpn-and-privacy-reviews/">The Trouble with VPN and Privacy Review Sites</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://torrentfreak.com/proxy-sh-vpn-provider-monitored-traffic-to-catch-hacker-130930/">Proxy.sh VPN Provider Sniffed Server Traffic to Catch Hacker</a></li>
-          <li><a href="https://proxy.sh/panel/knowledgebase.php?action=displayarticle&id=5">Ethical policy - All of the reasons why Proxy.sh might enable logging</a></li>
           <li><a href="https://www.ivpn.net/privacy">IVPN.net will collect your email and IP address after sign up</a><br />Read the <a data-toggle="tooltip" data-placement="top" data-original-title="The IP collected at signup is only used for a few seconds by our fraud module and then discarded, it is not stored. Storing them would significantly increase our own liability and certainly would not be in our interest. You're absolutely welcome to signup using Tor or a VPN.">Email statement</a> from IVPN.</li>
           <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>