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

Fix merge conflicts.

Browse Source
This commit is contained in:
J. C
2021-05-03 07:54:24 -05:00
parent 54b63b8fd7
commit 67b1f64533
4 changed files with 0 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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"