Finish fixing merge conflicts
This commit is contained in:
@ -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"
|
||||
|
@ -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>
|
||||
|
Reference in New Issue
Block a user