privacyguides/privacytools.io
Archived
1
0
Fork 0
Code Issues 304 Pull Requests 47 Activity

Finish fixing merge conflicts

Browse Source
This commit is contained in:
J. C 2021-05-03 08:08:40 -05:00
parent 67b1f64533
commit 7d77fdaaf4
No known key found for this signature in database
GPG Key ID: BB586627F6A02872
4 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
_includes/sections/browser-addons.html
View File

@ -98,7 +98,6 @@
title="Snowflake"
image="/assets/img/svg/3rd-party/snowflake.svg"
description="<strong>Snowflake</strong> is a new <a href=https://2019.www.torproject.org/docs/pluggable-transports.html.en>pluggable transport</a> from the Tor Project. If you have an uncensored connection, running this extension volunteers your connection to be used as a Snowflake proxy to help users unable to connect to the Tor network. Your IP will not be visible to the sites users visit using your proxy, as this extension will not make you an exit node. If your access to the Tor network is blocked, this extension will not assist you, and you should use the <a href=https://www.torproject.org>Tor Browser</a> instead. <strong>Note:</strong> This add-on does not work with WebRTC disabled."
description="<strong>Snowflake</strong> is a new <a href=https://2019.www.torproject.org/docs/pluggable-transports.html.en>pluggable transport</a> from the Tor Project. If you have an uncensored connection, running this extension volunteers your connection to be used as a Snowflake proxy to help users unable to connect to the Tor network. Your IP will not be visible to the sites users visit using your proxy, as this extension will not make you an exit node. If your access to the Tor network is blocked, this extension will not assist you, and you should use the <a href=https://www.torproject.org>Tor Browser</a> instead. <strong>Note:</strong> This add-on does not work with WebRTC disabled."
website="https://snowflake.torproject.org"
forum="https://forum.privacytools.io/t/discussion-snowflake/1146"
git="https://gitweb.torproject.org/pluggable-transports/snowflake.git"

2
_includes/sections/email-providers.html
View File

@ -219,8 +219,6 @@
<div class="col">
<h2 id="startmail" class="anchor"><a href="#startmail"><em class="fas fa-link anchor-icon"></em></a> StartMail {% include badge.html color="info" text="Personal USD $59.95/y" %}</h2>
<p><strong><a href="https://startmail.com">StartMail.com</a></strong> is an email service with a focus on security and privacy through the use of standard OpenPGP encryption. StartMail has been in operation since <strong>2014</strong> and is based in Boulevard 11, Zeist <span class="flag-icon flag-icon-nl"></span> Netherlands. Accounts start with 10GB. They offer a 30-day trial.</p>
<h2 id="startmail" class="anchor"><a href="#startmail"><em class="fas fa-link anchor-icon"></em></a> StartMail {% include badge.html color="info" text="Personal USD $59.95/y" %}</h2>
<p><strong><a href="https://startmail.com">StartMail.com</a></strong> is an email service with a focus on security and privacy through the use of standard OpenPGP encryption. StartMail has been in operation since <strong>2014</strong> and is based in Boulevard 11, Zeist <span class="flag-icon flag-icon-nl"></span> Netherlands. Accounts start with 10GB. They offer a 30-day trial.</p>
<h5>{% include badge.html color="success" text="Domains and Aliases" %}</h5>
<p>Personal accounts can use <a href="https://support.startmail.com/hc/en-us/articles/360007297457-Aliases">Custom or Generated</a> aliases. Business accounts can use <a href="https://support.startmail.com/hc/en-us/articles/360006840058">Domain aliases</a>.</p>

7
pages/donate.html
View File

@ -32,7 +32,6 @@ permalink: /donate/
<div class="col-md-12 col-lg-8 offset-lg-2 text-right">
<div class="form-group row">
<label for="BTC" class="col-sm-4 col-form-label"><strong>Bitcoin (BTC)</strong> <a href="/assets/img/svg/qr/btc.svg"><em class="fa fa-qrcode"></em></a></label>
<label for="BTC" class="col-sm-4 col-form-label"><strong>Bitcoin (BTC)</strong> <a href="/assets/img/svg/qr/btc.svg"><em class="fa fa-qrcode"></em></a></label>
<div class="col-sm-8">
<input id="BTC" type="text" value="1C3MVvvJwfEiS5KQmZzJkiVq7obYi2zRqb" class="form-control input-lg onclick-select" readonly>
@ -40,7 +39,6 @@ permalink: /donate/
</div>
<div class="form-group row">
<label for="BCH" class="col-sm-4 col-form-label"><strong>Bitcoin Cash (BCH)</strong> <a href="/assets/img/svg/qr/bch.svg"><em class="fa fa-qrcode"></em></a></label>
<label for="BCH" class="col-sm-4 col-form-label"><strong>Bitcoin Cash (BCH)</strong> <a href="/assets/img/svg/qr/bch.svg"><em class="fa fa-qrcode"></em></a></label>
<div class="col-sm-8">
<input id="BCH" type="text" value="bitcoincash:qzs5eh484cc7gq2frw4y0ygdg33uv6ucrq48ewgqqf" class="form-control input-lg onclick-select" readonly>
@ -48,7 +46,6 @@ permalink: /donate/
</div>
<div class="form-group row">
<label for="ETH" class="col-sm-4 col-form-label"><strong>Ethereum (ETH)</strong> <a href="/assets/img/svg/qr/eth.svg"><em class="fa fa-qrcode"></em></a></label>
<label for="ETH" class="col-sm-4 col-form-label"><strong>Ethereum (ETH)</strong> <a href="/assets/img/svg/qr/eth.svg"><em class="fa fa-qrcode"></em></a></label>
<div class="col-sm-8">
<input id="ETH" type="text" value="0x1DdD9c188aaf9198b664CeBce9a9cD03E75FdD49" class="form-control input-lg onclick-select" readonly>
@ -56,7 +53,6 @@ permalink: /donate/
</div>
<div class="form-group row">
<label for="ZEC" class="col-sm-4 col-form-label"><strong>Zcash (ZEC)</strong> <a href="/assets/img/svg/qr/zec.svg"><em class="fa fa-qrcode"></em></a></label>
<label for="ZEC" class="col-sm-4 col-form-label"><strong>Zcash (ZEC)</strong> <a href="/assets/img/svg/qr/zec.svg"><em class="fa fa-qrcode"></em></a></label>
<div class="col-sm-8">
<input id="ZEC" type="text" value="t1Sv6rSRchWUXkWNz7PkeYixTs9M2aAs4wX" class="form-control input-lg onclick-select" readonly>
@ -64,7 +60,6 @@ permalink: /donate/
</div>
<div class="form-group row">
<label for="LTC" class="col-sm-4 col-form-label"><strong>Litecoin (LTC)</strong> <a href="/assets/img/svg/qr/ltc.svg"><em class="fa fa-qrcode"></em></a></label>
<label for="LTC" class="col-sm-4 col-form-label"><strong>Litecoin (LTC)</strong> <a href="/assets/img/svg/qr/ltc.svg"><em class="fa fa-qrcode"></em></a></label>
<div class="col-sm-8">
<input id="LTC" type="text" value="LSccXrCDm7zu4Gc6PiiW6sBaKjADfFGQSQ" class="form-control input-lg onclick-select" readonly>
@ -72,7 +67,6 @@ permalink: /donate/
</div>
<div class="form-group row">
<label for="XLM" class="col-sm-4 col-form-label"><strong>Stellar (XLM)</strong> <a href="/assets/img/svg/qr/xlm.svg"><em class="fa fa-qrcode"></em></a></label>
<label for="XLM" class="col-sm-4 col-form-label"><strong>Stellar (XLM)</strong> <a href="/assets/img/svg/qr/xlm.svg"><em class="fa fa-qrcode"></em></a></label>
<div class="col-sm-8">
<input id="XLM" type="text" value="GA3GFFRS2PEZHFYOKYO5FSK5GAMW44AOGI4RY5ISXOWMD3PWAARFVAA4" class="form-control input-lg onclick-select" readonly>
@ -80,7 +74,6 @@ permalink: /donate/
</div>
<div class="form-group row">
<label for="XMR" class="col-sm-4 col-form-label"><strong>Monero (XMR)</strong> <a href="/assets/img/svg/qr/xmr.svg"><em class="fa fa-qrcode"></em></a></label>
<label for="XMR" class="col-sm-4 col-form-label"><strong>Monero (XMR)</strong> <a href="/assets/img/svg/qr/xmr.svg"><em class="fa fa-qrcode"></em></a></label>
<div class="col-sm-8">
<input id="XMR" type="text" value="45yJ8LkShLt2f9gCqbBQUcDw7um9XxD2vZ8h2Rt3GoLq9kMrznB3UAHBS1chJk9KjugpBbbJFGtdAeXE5j99wuGxDcbYUri" class="form-control input-lg onclick-select" readonly>

2
pages/sponsors.html
View File

@ -50,8 +50,6 @@ permalink: /sponsors/
<p>This website receives well over 250,000 pageviews on a monthly basis and is highly ranked for privacy-related keywords. In addition to the benefits below your contribution will be featured on our OpenCollective page and we will thank you via social media for your contribution.</p>
<p><em>Please note that this page is updated manually, and while we're generally on top of things, please don't hesitate to reach out to <a href="mailto:sponsors@privacytools.io">sponsors@privacytools.io</a> if you think we've missed something :)</em></p>
<h5><em class="fas fa-fw fa-user text-info"></em> Backers - $10–$24</h5>
<p><em>Please note that this page is updated manually, and while we're generally on top of things, please don't hesitate to reach out to <a href="mailto:sponsors@privacytools.io">sponsors@privacytools.io</a> if you think we've missed something :)</em></p>
<h5><em class="fas fa-fw fa-user text-info"></em> Backers - $10–$24</h5>
<ul>
<li>Your name added to the list of sponsors on this page.</li>
</ul>