Fix merge conflicts.
This commit is contained in:
J. C
parent
54b63b8fd7
commit
67b1f64533
@ -97,11 +97,8 @@
|
||||
{% include cardv2.html
|
||||
title="Snowflake"
|
||||
image="/assets/img/svg/3rd-party/snowflake.svg"
|
||||
<<<<<<< HEAD
|
||||
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."
|
||||
>>>>>>> fix
|
||||
website="https://snowflake.torproject.org"
|
||||
forum="https://forum.privacytools.io/t/discussion-snowflake/1146"
|
||||
git="https://gitweb.torproject.org/pluggable-transports/snowflake.git"
|
||||
|
||||
@ -16,13 +16,10 @@
|
||||
alt="ProtonMail">
|
||||
</div>
|
||||
<div class="col">
|
||||
<<<<<<< HEAD
|
||||
<h2 id="protonmail" class="anchor"><a href="#protonmail"><em class="fas fa-link anchor-icon"></em></a> ProtonMail {% include badge.html color="info" text="Free" %}</h2>
|
||||
<p><strong><a href="https://protonmail.com">ProtonMail.com</a></strong> is an email service with a focus on privacy, encryption, security, and ease of use. They have been in operation since <strong>2013</strong>. ProtonMail is based in Genève, <span class="flag-icon flag-icon-ch"></span> Switzerland. Accounts start with 500 MB storage with their free plan.</p>
|
||||
=======
|
||||
<h2 id="protonmail" class="anchor"><a href="#protonmail"><em class="fas fa-link anchor-icon"></em></a> ProtonMail {% include badge.html color="info" text="Free" %}</h2>
|
||||
<p><strong><a href="https://protonmail.com">ProtonMail.com</a></strong> is an email service with a focus on privacy, encryption, security, and ease of use. They have been in operation since <strong>2013</strong>. ProtonMail is based in Genève, <span class="flag-icon flag-icon-ch"></span> Switzerland. Accounts start with 500 MB storage with their free plan.</p>
|
||||
>>>>>>> fix
|
||||
|
||||
<p>Free accounts have some limitations and do not allow the use of the <a href="https://protonmail.com/bridge">ProtonMail Bridge</a>, which is required to use a <a href="/software/email">recommended email client</a> (e.g. Thunderbird) or to search email by body text. Paid accounts are available starting at <strong>€48/y</strong> which include features like ProtonMail Bridge, additional storage, custom domain support, and more. The webmail and mobile apps can only search <code>To:</code>, <code>From:</code>, <code>Date:</code> and <code>Subject:</code> (this is likely to change when <a href="https://reddit.com/comments/cqwk2a/comment/ex21b4e">v4.0</a> of ProtonMail is released).</p>
|
||||
|
||||
@ -59,13 +56,10 @@
|
||||
alt="Mailbox">
|
||||
</div>
|
||||
<div class="col">
|
||||
<<<<<<< HEAD
|
||||
<h2 id="mailbox" class="anchor"><a href="#mailbox"><em class="fas fa-link anchor-icon"></em></a> Mailbox.org {% include badge.html color="info" text="€12/y" %}</h2>
|
||||
<p><strong><a href="https://mailbox.org">Mailbox.org</a></strong> is an email service with a focus on being secure, ad-free, and privately powered by 100% eco-friendly energy. They have been in operation since <strong>2014</strong>. Mailbox.org is based in Berlin, <span class="flag-icon flag-icon-de"></span> Germany. Accounts start with 2 GB of storage, which can be upgraded as needed.</p>
|
||||
=======
|
||||
<h2 id="mailbox" class="anchor"><a href="#mailbox"><em class="fas fa-link anchor-icon"></em></a> Mailbox.org {% include badge.html color="info" text="€12/y" %}</h2>
|
||||
<p><strong><a href="https://mailbox.org">Mailbox.org</a></strong> is an email service with a focus on being secure, ad-free, and privately powered by 100% eco-friendly energy. They have been in operation since <strong>2014</strong>. Mailbox.org is based in Berlin, <span class="flag-icon flag-icon-de"></span> Germany. Accounts start with 2 GB of storage, which can be upgraded as needed.</p>
|
||||
>>>>>>> fix
|
||||
|
||||
<h5>{% include badge.html color="success" text="Domains and Aliases" %}</h5>
|
||||
<p>Mailbox.org lets users use their own domain and they support <a href="https://kb.mailbox.org/display/MBOKBEN/Using+catch-all+alias+with+own+domain">catch-all</a> addresses. Mailbox.org also supports <a href="https://kb.mailbox.org/display/BMBOKBEN/What+is+an+alias+and+how+do+I+use+it">subaddressing</a>, which is useful for users who don't want to purchase a domain.</p>
|
||||
@ -101,13 +95,10 @@
|
||||
alt="Posteo">
|
||||
</div>
|
||||
<div class="col">
|
||||
<<<<<<< HEAD
|
||||
<h2 id="posteo" class="anchor"><a href="#posteo"><em class="fas fa-link anchor-icon"></em></a> Posteo {% include badge.html color="info" text="€12/y" %}</h2>
|
||||
<p><strong><a href="https://posteo.de">Posteo.de</a></strong> is an email provider that focuses on anonymous, secure, and private email. Their servers are powered by 100% sustainable energy. They have been in operation since <strong>2009</strong>. Posteo is based in <span class="flag-icon flag-icon-de"></span> Germany and has a free 14-day trial. Posteo comes with 2 GB for the monthly cost and an extra gigabyte can be purchased for €0.25 per month.</p>
|
||||
=======
|
||||
<h2 id="posteo" class="anchor"><a href="#posteo"><em class="fas fa-link anchor-icon"></em></a> Posteo {% include badge.html color="info" text="€12/y" %}</h2>
|
||||
<p><strong><a href="https://posteo.de">Posteo.de</a></strong> is an email provider that focuses on anonymous, secure, and private email. Their servers are powered by 100% sustainable energy. They have been in operation since <strong>2009</strong>. Posteo is based in <span class="flag-icon flag-icon-de"></span> Germany and has a free 14-day trial. Posteo comes with 2 GB for the monthly cost and an extra gigabyte can be purchased for €0.25 per month.</p>
|
||||
>>>>>>> fix
|
||||
|
||||
<h5>{% include badge.html color="warning" text="Domains and Aliases" %}</h5>
|
||||
<p>Posteo does <a href="https://posteo.de/en/site/faq">not allow the use of custom domains</a>, however users may still make use of <a href="https://posteo.de/en/help/what-is-an-email-alias">subaddressing</a>.</p>
|
||||
@ -143,13 +134,10 @@
|
||||
alt="Disroot">
|
||||
</div>
|
||||
<div class="col">
|
||||
<<<<<<< HEAD
|
||||
<h2 id="disroot" class="anchor"><a href="#disroot"><em class="fas fa-link anchor-icon"></em></a> Disroot {% include badge.html color="info" text="Free" %}</h2>
|
||||
<p><strong><a href="https://disroot.org/en/services/email">Disroot</a></strong> offers email amongst <a href="https://disroot.org/en/#services">other services</a>. The service is maintained by volunteers and its community. They have been in operation since <strong>2015</strong>. Disroot is based in <span class="flag-icon flag-icon-nl"></span> Amsterdam. Disroot is free and uses open source software such as Rainloop to provide service. Users support the service through donations and buying extra storage. The mailbox limit is 1 GB, but extra storage can be purchased 0.15€ per GB per month paid yearly.</p>
|
||||
=======
|
||||
<h2 id="disroot" class="anchor"><a href="#disroot"><em class="fas fa-link anchor-icon"></em></a> Disroot {% include badge.html color="info" text="Free" %}</h2>
|
||||
<p><strong><a href="https://disroot.org/en/services/email">Disroot</a></strong> offers email amongst <a href="https://disroot.org/en/#services">other services</a>. The service is maintained by volunteers and its community. They have been in operation since <strong>2015</strong>. Disroot is based in <span class="flag-icon flag-icon-nl"></span> Amsterdam. Disroot is free and uses open source software such as Rainloop to provide service. Users support the service through donations and buying extra storage. The mailbox limit is 1 GB, but extra storage can be purchased 0.15€ per GB per month paid yearly.</p>
|
||||
>>>>>>> fix
|
||||
|
||||
<h5>{% include badge.html color="success" text="Domains and Aliases" %}</h5>
|
||||
<p>Disroot lets users use their own domain. They have aliases, however you must <a href="https://disroot.org/en/forms/alias-request-form">manually apply</a> for them.</p>
|
||||
@ -185,13 +173,10 @@
|
||||
alt="Tutanota">
|
||||
</div>
|
||||
<div class="col">
|
||||
<<<<<<< HEAD
|
||||
<h2 id="tutanota" class="anchor"><a href="#tutanota"><em class="fas fa-link anchor-icon"></em></a> Tutanota {% include badge.html color="info" text="Free" %}</h2>
|
||||
<p><strong><a href="https://tutanota.com">Tutanota.com</a></strong> is an email service with a focus on security and privacy through the use of encryption. Tutanota has been in operation since <strong>2011</strong> and is based in Hanover, <span class="flag-icon flag-icon-de"></span> Germany. Accounts start with 1GB storage with their free plan.</p>
|
||||
=======
|
||||
<h2 id="tutanota" class="anchor"><a href="#tutanota"><em class="fas fa-link anchor-icon"></em></a> Tutanota {% include badge.html color="info" text="Free" %}</h2>
|
||||
<p><strong><a href="https://tutanota.com">Tutanota.com</a></strong> is an email service with a focus on security and privacy through the use of encryption. Tutanota has been in operation since <strong>2011</strong> and is based in Hanover, <span class="flag-icon flag-icon-de"></span> Germany. Accounts start with 1GB storage with their free plan.</p>
|
||||
>>>>>>> fix
|
||||
<p>Tutanota <a href="https://tutanota.com/faq/#imap">doesn't allow</a> the use of third-party <a href="/software/email/">email clients</a>. There are plans to allow Tutanota pull email from <a href="https://github.com/tutao/tutanota/issues/544">external email accounts</a> using the <a href="https://en.wikipedia.org/wiki/Internet_Message_Access_Protocol">IMAP</a> protocol. <a href="https://github.com/tutao/tutanota/issues/630">Email import</a> is currently not possible.</p>
|
||||
<p>Emails can be exported <a href="https://tutanota.com/howto#generalMail">individually or by bulk selection</a>. Tutanota does not allow for <a href="https://github.com/tutao/tutanota/issues/927">subfolders</a> as you might expect with other email providers.</p>
|
||||
<p>Tutanota is working on a <a href="https://tutanota.com/blog/posts/desktop-clients/">desktop client</a> and they have an app <a href="https://f-droid.org/packages/de.tutao.tutanota">available in F-Droid</a>. They also have their app in conventional stores such as <a href="https://apps.apple.com/us/app/tutanota/id922429609">App Store</a> on iOS and <a href="https://play.google.com/store/apps/details?id=de.tutao.tutanota">Google Play</a> for Android.</p>
|
||||
@ -232,13 +217,10 @@
|
||||
alt="StartMail">
|
||||
</div>
|
||||
<div class="col">
|
||||
<<<<<<< HEAD
|
||||
<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>
|
||||
>>>>>>> fix
|
||||
|
||||
<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>
|
||||
|
||||
@ -32,77 +32,56 @@ permalink: /donate/
|
||||
<div class="col-md-12 col-lg-8 offset-lg-2 text-right">
|
||||
|
||||
<div class="form-group row">
|
||||
<<<<<<< HEAD
|
||||
<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>
|
||||
>>>>>>> fix
|
||||
<div class="col-sm-8">
|
||||
<input id="BTC" type="text" value="1C3MVvvJwfEiS5KQmZzJkiVq7obYi2zRqb" class="form-control input-lg onclick-select" readonly>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<<<<<<< HEAD
|
||||
<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>
|
||||
>>>>>>> fix
|
||||
<div class="col-sm-8">
|
||||
<input id="BCH" type="text" value="bitcoincash:qzs5eh484cc7gq2frw4y0ygdg33uv6ucrq48ewgqqf" class="form-control input-lg onclick-select" readonly>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<<<<<<< HEAD
|
||||
<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>
|
||||
>>>>>>> fix
|
||||
<div class="col-sm-8">
|
||||
<input id="ETH" type="text" value="0x1DdD9c188aaf9198b664CeBce9a9cD03E75FdD49" class="form-control input-lg onclick-select" readonly>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<<<<<<< HEAD
|
||||
<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>
|
||||
>>>>>>> fix
|
||||
<div class="col-sm-8">
|
||||
<input id="ZEC" type="text" value="t1Sv6rSRchWUXkWNz7PkeYixTs9M2aAs4wX" class="form-control input-lg onclick-select" readonly>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<<<<<<< HEAD
|
||||
<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>
|
||||
>>>>>>> fix
|
||||
<div class="col-sm-8">
|
||||
<input id="LTC" type="text" value="LSccXrCDm7zu4Gc6PiiW6sBaKjADfFGQSQ" class="form-control input-lg onclick-select" readonly>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<<<<<<< HEAD
|
||||
<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>
|
||||
>>>>>>> fix
|
||||
<div class="col-sm-8">
|
||||
<input id="XLM" type="text" value="GA3GFFRS2PEZHFYOKYO5FSK5GAMW44AOGI4RY5ISXOWMD3PWAARFVAA4" class="form-control input-lg onclick-select" readonly>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<<<<<<< HEAD
|
||||
<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>
|
||||
>>>>>>> fix
|
||||
<div class="col-sm-8">
|
||||
<input id="XMR" type="text" value="45yJ8LkShLt2f9gCqbBQUcDw7um9XxD2vZ8h2Rt3GoLq9kMrznB3UAHBS1chJk9KjugpBbbJFGtdAeXE5j99wuGxDcbYUri" class="form-control input-lg onclick-select" readonly>
|
||||
</div>
|
||||
|
||||
@ -48,13 +48,10 @@ permalink: /sponsors/
|
||||
<p>As a sponsor of {{ site.name }}, your company will be widely recognized in a variety of ways, some of which we've detailed below.</p>
|
||||
<h5>General Information</h5>
|
||||
<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>
|
||||
<<<<<<< HEAD
|
||||
<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>
|
||||
>>>>>>> fix
|
||||
<ul>
|
||||
<li>Your name added to the list of sponsors on this page.</li>
|
||||
</ul>
|
||||
|
||||
Reference in New Issue
Block a user