Update Team Members

_includes/sections/dns.html

@@ -538,113 +538,97 @@ We also log how many times this or that tracker has been blocked. We need this i
 </h1>
 
 {%
-  include cardv2.html
+	include cardv2.html
-  title="Unbound"
+	title="Unbound"
-  image="/assets/img/svg/3rd-party/unbound.svg"
+	image="/assets/img/svg/3rd-party/unbound.svg"
-  description='A validating, recursive, caching DNS resolver, supporting DNS-over-TLS, and has been <a href="https://ostif.org/our-audit-of-unbound-dns-by-x41-d-sec-full-results/">independently audited</a>.'
+	description='A validating, recursive, caching DNS resolver, supporting DNS-over-TLS, and has been <a href="https://ostif.org/our-audit-of-unbound-dns-by-x41-d-sec-full-results/">independently audited</a>.'
-  website="https://nlnetlabs.nl/projects/unbound/about/"
+	website="https://nlnetlabs.nl/projects/unbound/about/"
-  forum="https://forum.privacytools.io/t/discussion-unbound/3563"
+	forum="https://forum.privacytools.io/t/discussion-unbound/3563"
-  github="https://github.com/NLnetLabs/unbound"
+	github="https://github.com/NLnetLabs/unbound"
 %}
 
 {%
-  include cardv2.html
+	include cardv2.html
-  title="dnscrypt-proxy"
+	title="dnscrypt-proxy"
-  image="/assets/img/svg/3rd-party/dnscrypt-proxy.svg"
+	image="/assets/img/svg/3rd-party/dnscrypt-proxy.svg"
-  description='A DNS proxy with support for DNSCrypt, DNS-over-HTTPS, and <a href="https://github.com/DNSCrypt/dnscrypt-protocol/blob/master/ANONYMIZED-DNSCRYPT.txt">Anonymized DNSCrypt</a>, a <a href="https://github.com/DNSCrypt/dnscrypt-proxy/wiki/Anonymized-DNS">relay-based protocol that the hides client IP address.</a>'
+	description='A DNS proxy with support for DNSCrypt, DNS-over-HTTPS, and <a href="https://github.com/DNSCrypt/dnscrypt-protocol/blob/master/ANONYMIZED-DNSCRYPT.txt">Anonymized DNSCrypt</a>, a <a href="https://github.com/DNSCrypt/dnscrypt-proxy/wiki/Anonymized-DNS">relay-based protocol that the hides client IP address.</a>'
-  website="https://github.com/DNSCrypt/dnscrypt-proxy/wiki"
+	website="https://github.com/DNSCrypt/dnscrypt-proxy/wiki"
-  forum="https://forum.privacytools.io/t/discussion-dnscrypt-proxy/1498"
+	forum="https://forum.privacytools.io/t/discussion-dnscrypt-proxy/1498"
-  github="https://github.com/DNSCrypt/dnscrypt-proxy"
+	github="https://github.com/DNSCrypt/dnscrypt-proxy"
 %}
 
 {%
-  include cardv2.html
+	include cardv2.html
-  title="Stubby"
+	title="Stubby"
-  image="/assets/img/png/3rd-party/stubby.png"
+	image="/assets/img/png/3rd-party/stubby.png"
-  description='An application that acts as a local DNS-over-TLS stub resolver. Stubby can be used in <a href="https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Clients#DNSPrivacyClients-Unbound/Stubbycombination">combination with Unbound</a> by managing the upstream TLS connections (since Unbound cannot yet re-use TCP/TLS connections) with Unbound providing a local cache.'
+	description='An application that acts as a local DNS-over-TLS stub resolver. Stubby can be used in <a href="https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Clients#DNSPrivacyClients-Unbound/Stubbycombination">combination with Unbound</a> by managing the upstream TLS connections (since Unbound cannot yet re-use TCP/TLS connections) with Unbound providing a local cache.'
-  website="https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Daemon+-+Stubby"
+	website="https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Daemon+-+Stubby"
-  forum="https://forum.privacytools.io/t/discussion-stubby/3582"
+	forum="https://forum.privacytools.io/t/discussion-stubby/3582"
-  github="https://github.com/getdnsapi/stubby"
+	github="https://github.com/getdnsapi/stubby"
 %}
 
 {%
-  include cardv2.html
+	include cardv2.html
-  title="Firefox's built-in DNS-over-HTTPS resolver"
+	title="Firefox's built-in DNS-over-HTTPS resolver"
-  image="/assets/img/svg/3rd-party/firefox_browser.svg"
+	image="/assets/img/svg/3rd-party/firefox_browser.svg"
-  description='Firefox comes with built-in DNS-over-HTTPS support for <a href="https://blog.mozilla.org/blog/2020/02/25/firefox-continues-push-to-bring-dns-over-https-by-default-for-us-users/">NextDNS and Cloudflare</a> but users can manually any other DoH resolver.'
+	description='Firefox comes with built-in DNS-over-HTTPS support for <a href="https://blog.mozilla.org/blog/2020/02/25/firefox-continues-push-to-bring-dns-over-https-by-default-for-us-users/">NextDNS and Cloudflare</a> but users can manually any other DoH resolver.'
-  labels="color==warning::icon==fas fa-exclamation-triangle::link==https://developers.cloudflare.com/1.1.1.1/privacy/firefox::text==Warning::tooltip==Cloudflare logs a limited amount of data about the DNS requests that are sent to their custom resolver for Firefox."
+	labels="color==warning::icon==fas fa-exclamation-triangle::link==https://developers.cloudflare.com/1.1.1.1/privacy/firefox::text==Warning::tooltip==Cloudflare logs a limited amount of data about the DNS requests that are sent to their custom resolver for Firefox."
-  website="https://support.mozilla.org/en-US/kb/firefox-dns-over-https"
+	website="https://support.mozilla.org/en-US/kb/firefox-dns-over-https"
-  privacy-policy="https://wiki.mozilla.org/Security/DOH-resolver-policy"
+	privacy-policy="https://wiki.mozilla.org/Security/DOH-resolver-policy"
-  forum="https://forum.privacytools.io/t/discussion-firefox-s-built-in-dns-over-https-resolver/3564"
+	forum="https://forum.privacytools.io/t/discussion-firefox-s-built-in-dns-over-https-resolver/3564"
 %}
 
 <h1 id="dns-android-clients" class="anchor">
-  <a href="#dns-android-clients">
+	<a href="#dns-android-clients">
-    <i class="fas fa-link anchor-icon"></i>
+		<i class="fas fa-link anchor-icon"></i>
-  </a> Encrypted DNS Client Recommendations for Android
+	</a> Encrypted DNS Client Recommendations for Android
 </h1>
 
 {%
-  include cardv2.html
+	include cardv2.html
-  title="Android 9's built-in DNS-over-TLS resolver"
+	title="Android 9's built-in DNS-over-TLS resolver"
-  image="/assets/img/svg/3rd-party/android.svg"
+	image="/assets/img/svg/3rd-party/android.svg"
-  description="Android 9 (Pie) comes with built-in DNS-over-TLS support without the need for a 3rd-party application."
+	description="Android 9 (Pie) comes with built-in DNS-over-TLS support without the need for a 3rd-party application."
-  labels="color==warning::icon==fas fa-exclamation-triangle::link==https://developers.google.com/speed/public-dns/docs/using#android_9_pie_or_later::text==Warning::tooltip==Android 9's DoT settings have no effect when used concurrently with VPN-based apps which override the DNS."
+	labels="color==warning::icon==fas fa-exclamation-triangle::link==https://developers.google.com/speed/public-dns/docs/using#android_9_pie_or_later::text==Warning::tooltip==Android 9's DoT settings have no effect when used concurrently with VPN-based apps which override the DNS."
-  website="https://support.google.com/android/answer/9089903#private_dns"
+	website="https://support.google.com/android/answer/9089903#private_dns"
-  forum="https://forum.privacytools.io/t/discussion-android-9s-built-in-dns-over-tls-resolver/3562"
+	forum="https://forum.privacytools.io/t/discussion-android-9s-built-in-dns-over-tls-resolver/3562"
 %}
 
 {%
-  include cardv2.html
+	include cardv2.html
-  title="Nebulo"
+	title="Nebulo"
-  image="/assets/img/png/3rd-party/nebulo.png"
+	image="/assets/img/png/3rd-party/nebulo.png"
-  description='An open-source Android client supporting DNS-over-HTTPS and DNS-over-TLS, caching DNS responses, and locally logging DNS queries.'
+	description='An open-source Android client supporting DNS-over-HTTPS and DNS-over-TLS, caching DNS responses, and locally logging DNS queries.'
-  website="https://git.frostnerd.com/PublicAndroidApps/smokescreen/-/blob/master/README.md"
+	website="https://git.frostnerd.com/PublicAndroidApps/smokescreen/-/blob/master/README.md"
-  privacy-policy="https://smokescreen.app/privacypolicy"
+	privacy-policy="https://smokescreen.app/privacypolicy"
-  forum="https://forum.privacytools.io/t/discussion-nebulo/3565"
+	forum="https://forum.privacytools.io/t/discussion-nebulo/3565"
-  fdroid="https://git.frostnerd.com/PublicAndroidApps/smokescreen#f-droid"
+	fdroid="https://git.frostnerd.com/PublicAndroidApps/smokescreen#f-droid"
-  googleplay="https://play.google.com/store/apps/details?id=com.frostnerd.smokescreen"
+	googleplay="https://play.google.com/store/apps/details?id=com.frostnerd.smokescreen"
-  source="https://git.frostnerd.com/PublicAndroidApps/smokescreen"
+	source="https://git.frostnerd.com/PublicAndroidApps/smokescreen"
 %}
 
 <h1 id="dns-ios-clients" class="anchor">
-  <a href="#dns-ios-clients">
+	<a href="#dns-ios-clients">
-    <i class="fas fa-link anchor-icon"></i>
+		<i class="fas fa-link anchor-icon"></i>
-  </a> Encrypted DNS Client Recommendations for iOS
+	</a> Encrypted DNS Client Recommendations for iOS
 </h1>
 
 {%
-  include cardv2.html
+	include cardv2.html
-  title="DNSCloak"
+	title="DNSCloak"
-  image="/assets/img/png/3rd-party/dnscloak.png"
+	image="/assets/img/png/3rd-party/dnscloak.png"
-  description='An open-source iOS client supporting DNS-over-HTTPS, DNSCrypt, and <a href="https://github.com/DNSCrypt/dnscrypt-proxy/wiki">dnscrypt-proxy</a> options such as caching DNS responses, locally logging DNS queries, and custom block lists. Users can <a href="https://blog.privacytools.io/adding-custom-dns-over-https-resolvers-to-dnscloak/">add custom resolvers by DNS stamp</a>.'
+	description='An open-source iOS client supporting DNS-over-HTTPS, DNSCrypt, and <a href="https://github.com/DNSCrypt/dnscrypt-proxy/wiki">dnscrypt-proxy</a> options such as caching DNS responses, locally logging DNS queries, and custom block lists. Users can <a href="https://blog.privacytools.io/adding-custom-dns-over-https-resolvers-to-dnscloak/">add custom resolvers by DNS stamp</a>.'
-  website="https://github.com/s-s/dnscloak/blob/master/README.md"
+	website="https://github.com/s-s/dnscloak/blob/master/README.md"
-  privacy-policy="https://drive.google.com/file/d/1050No_pU74CAWUS5-BwQWyO2x_aiMzWc/view"
+	privacy-policy="https://drive.google.com/file/d/1050No_pU74CAWUS5-BwQWyO2x_aiMzWc/view"
-  forum="https://forum.privacytools.io/t/discussion-dnscloak/3566"
+	forum="https://forum.privacytools.io/t/discussion-dnscloak/3566"
-  ios="https://apps.apple.com/app/id1452162351"
+	ios="https://apps.apple.com/app/id1452162351"
-  github="https://github.com/s-s/dnscloak"
+	github="https://github.com/s-s/dnscloak"
 %}
 
-<h2 id="appledns" class="anchor">
-  <a href="#appledns">
-    <i class="fas fa-link anchor-icon"></i>
-  </a>Apple's native support
-</h2>
-
-<p>
-  In iOS, iPadOS, tvOS 14 and macOS 11, DoT and DoH were introduced. DoT and DoH are supported natively by installation of profiles (through mobileconfig files opened in <em>Safari</em>).
-  After installation, the encrypted DNS server can be selected in <em>Settings &rarr; General &rarr; VPN and Network &rarr; DNS</em>.
-</p>
-
-<ul>
-  <li><strong>Signed profiles</strong> are offered by <a href="https://adguard.com/en/blog/encrypted-dns-ios-14.html">AdGuard</a> and <a href="https://apple.nextdns.io/">NextDNS</a>.</li>
-  <li>User contributed <strong>unsigned profiles</strong> for several DNS providers are hosted by <a href="https://encrypted-dns.party/">encrypted-dns.party</a>.</li>
-</ul>
-
 <h2 id="dns-definitions" class="anchor">
-  <a href="#dns-definitions">
+	<a href="#dns-definitions">
-    <i class="fas fa-link anchor-icon"></i>
+		<i class="fas fa-link anchor-icon"></i>
-  </a> Definitions
+	</a> Definitions
 </h2>
 
 <h4>DNS-over-TLS (DoT)</h4>

_includes/sections/email-clients.html

@@ -45,7 +45,7 @@
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://k9mail.app/">K-9 Mail</a> - An independent mail application for Android. It supports both POP3 and IMAP mailboxes, but only supports push mail for IMAP.</li>
+  <li><a href="https://github.com/k9mail/k-9/releases">K-9 Mail</a> - An independent mail application for Android. It supports both POP3 and IMAP mailboxes, but only supports push mail for IMAP.</li>
   <li><a href="https://www.gnupg.org/">GNU Privacy Guard</a> - Email Encryption. GnuPG is a GPL Licensed alternative to the PGP suite of cryptographic software. <a href="https://theprivacyguide.org/tutorials/gpg.html">Tutorial.</a> Use <a href="https://gpgtools.org/">GPGTools for macOS.</a></li>
   <li><a href="https://www.mailpile.is/">Mailpile (Beta)</a> - A modern, fast web-mail client with user-friendly encryption and privacy features.</li>
 </ul>

_includes/sections/file-encryption.html

@@ -72,10 +72,4 @@
     link="https://github.com/aonez/Keka#so-where-is-the-source-code"
     tooltip="This software is no longer open source."
     %}</li>
-    <li><a href="https://kryptor.co.uk/">Kryptor</a> is a file encryption program for Windows, MacOS, and Linux.
-      {% include badge.html
-      color="warning"
-      icon="fas fa-exclamation-triangle"
-      tooltip="As Kryptor is still in beta, it may not be stable."
-      %}</li>
 </ul>

_includes/sponsors/gold.html

@@ -22,19 +22,4 @@
       title="Insurgo Technologies Libres / Open Technologies — Empower yourself!"
       alt="Insurgo Logo" />
   </a>
-  <a class="m-3" href="https://joindeleteme.com" target="_blank" rel="noreferrer">
-    <img
-      src="/assets/img/png/3rd-party/sponsors/deleteme.png"
-      height="70rem"
-      title="DeleteMe is a hands-free subscription service that removes your personal information from data brokers and prevents it from being sold online."
-      alt="DeleteMe Logo" />
-  </a>
-  <a class="m-3" href="https://www.removemyphone.com" target="_blank" rel="noreferrer">
-    <img
-      src="/assets/img/png/3rd-party/sponsors/removemyphone.png"
-      {% unless page.url == '/sponsors/' %}data-theme-src="/assets/img/png/3rd-party/sponsors/removemyphone-dark.png"{% endunless %}
-      height="70rem"
-      title="RemoveMyPhone helps you delete your data from data broker sites and Google, Bing, and Yahoo search results."
-      alt="RemoveMyPhone Logo" />
-  </a>
 </div>

_includes/sponsors/list.html

@@ -1,7 +1,5 @@
 <ul class="d-flex flex-wrap list-group-flush">
-  <li class="list-group-item flex-fill">Alex</li>
   <li class="list-group-item flex-fill">Daw-Ran Liou</li>
-  <li class="list-group-item flex-fill">Greg Werbin</li>
   <li class="list-group-item flex-fill">Michael DeMichillie</li>
   <li class="list-group-item flex-fill">Nathan Myers</li>
   <li class="list-group-item flex-fill">PablO</li>

pages/about/about.html

@@ -25,7 +25,7 @@ hidedesc: true
     <h2>Team Members</h2>
   </div>
 </div>
-
+  
 <div class="row">
 {% include team.html
 avatar="burung.png"
@@ -57,10 +57,10 @@ email="https://dngray.netlify.com/email"
 keys="https://keybase.io/dngray"
 mastodon="https://social.privacytools.io/@dngray"
 %}
-
+  
 {% include team.html
 avatar="freddy.png"
-name="Freddy Marsden"
+name="Freddy Marsden" 
 nick="Freddy"
 bio="I'm an amateur writer covering privacy, security and open-source development."
 role="Blogging & Education"
@@ -69,9 +69,8 @@ email="mailto:freddy@privacytools.io"
 mastodon="https://social.privacytools.io/@freddy"
 blog="freddy"
 %}
-
+  
 {% include team.html
-avatar="lynn.png"
 name="Lynn Stephenson"
 bio="I'm a software developer doing some pentesting on the side, specializing in security, cryptography, networking, web development, and accessibility."
 role="Researcher"
@@ -140,15 +139,12 @@ keys="https://nitrohorse.com/keys"
 blog="nitrohorse"
 emeritus=true
 %}
-
+  
-{% include team.html
+ {% include team.html
 name="Jonah Aragon"
-role="Former Sysadmin"
+website="https://www.jonaharagon.com"
-website="https://jonaharagon.com"
+keys="https://keybase.io/jonaharagon"
-keys="https://jonaharagon.com/accounts/"
-mastodon="https://social.privacytools.io/@jonah"
 blog="jonah"
-twitter="JonahAragon"
 emeritus=true
 %}
 </div>

pages/about/librejs.html

@@ -17,7 +17,7 @@ permalink: /about/javascript/
   </tr>
   <tr>
     <td><a href="/assets/js/bootstrap.min.js">bootstrap.min.js</a></td>
-    <td><a href="https://github.com/twbs/bootstrap/raw/main/LICENSE">Expat</a></td>
+    <td><a href="https://github.com/twbs/bootstrap/raw/master/LICENSE">Expat</a></td>
   </tr>
   <tr>
     <td><a href="/assets/js/jquery-3.3.1.min.js">jquery-3.3.1.min.js</a></td>