Merge branch 'master' of https://github.com/privacytoolsIO/privacytools.io

README.md

@@ -2,7 +2,7 @@
 
 _Encryption Against Global Mass Surveillance._
 
-#Contributing
+# Contributing
 
 It's important for a website like privacytools.io to be up-to-date. Keep an eye on software updates of the applications listed here. Follow recent news about providers that are recommended. We try our best to keep up but we're not perfect and the internet is changing fast. So if you find an error, or you think a provider should not be listed here, or a qualified service provider is missing or a browser plugin is not the best choice anymore or anything else...
 
@@ -11,20 +11,20 @@ It's important for a website like privacytools.io to be up-to-date. Keep an eye
 You can submit your suggestions here on GitHub [(Issues)](https://github.com/privacytoolsIO/privacytools.io/issues) and also in our [subreddit](https://www.reddit.com/r/privacytoolsIO/). Thank you.
 
 
-#Contributing Guidelines
+# Contributing Guidelines
 Please read this before contributing.
 
-##Rules
+## Rules
 
 - Be nice and respectful.
 - English only.
 - Be constructive.
 
-##Quality over Quantity
+## Quality over Quantity
 
 We're trying to keep it simple and promote the best tools, not all of them. Maximum are three software choices, but it's possible to add more under "Worth Mentioning" headlines. ([example](https://www.privacytools.io/#im)) 
 
-##Software Criteria
+## Software Criteria
 
 - Open Source
 - Cross-platform
@@ -33,22 +33,22 @@ We're trying to keep it simple and promote the best tools, not all of them. Maxi
 
 There can be exeptions if no software is available that meet the criteria.
 
-##Images
+## Images
 
 - Provider logos should be exactly 200 x 70 ([example](https://www.privacytools.io/img/provider/AirVPN.gif))
 - Tool logos should be exactly 120 x 120 ([example](https://www.privacytools.io/img/tools/ChatSecure.png))
 
-#Support privacytools.io
+# Support privacytools.io
 
 - [Donate.](https://www.privacytools.io/donate.html)
 - [Spread the word.](https://www.privacytools.io/#participate)
 - [Make suggestions on reddit.](https://www.reddit.com/r/privacytoolsIO/)
 - View and edit our website source code here on GitHub.
 
-#Community Translations
+# Community Translations
 - [繁体中文 / Chinese](https://github.com/twngo/privacytools-zh) - [GitHub](https://github.com/twngo/privacytools-zh)
 - [Español / Spanish](https://victorhck.gitlab.io/privacytools-es/) - [GitLab](https://gitlab.com/victorhck/privacytools-es)
 - [Deutsch / German](https://privacytools.it-sec.rocks/) - [GitHub](https://github.com/Anon215/privacytools.it-sec.rocks)
 
-#License
+# License
 [GNU General Public License v3.0](https://github.com/privacytoolsIO/privacytools.io/blob/master/LICENSE.txt)

img/flags/4x3/tw.svg

@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="480" width="640">
+  <defs>
+    <clipPath id="a">
+      <path fill-opacity=".67" d="M0 0h682.67v512H0z"/>
+    </clipPath>
+  </defs>
+  <g fill-rule="evenodd" clip-path="url(#a)" transform="scale(.9375)" stroke-width="1pt">
+    <path fill="#de2110" d="M0 0h768v512H0z"/>
+    <path fill="#08399c" d="M0 0h385.69v256H0z"/>
+    <path fill="#fff" d="M282.098 178.555l-47.332-9.733 10.083 47.26-36.133-32.088-14.904 45.97-15.244-45.867-35.886 32.367 9.733-47.332-47.26 10.073 32.088-36.123-45.969-14.904 45.855-15.244-32.356-35.89 47.332 9.73-10.073-47.262 36.123 32.093 14.904-45.97 15.244 45.859 35.886-32.36-9.733 47.335 47.26-10.08-32.088 36.132 45.97 14.893-45.856 15.244z"/>
+    <path fill="#005387" d="M238.47 174.924l-14.935 7.932-14.57 8.608-16.918-.583-16.919.198-14.36-8.941-14.759-8.275-7.953-14.906-8.631-14.52.574-16.874-.188-16.883 8.965-14.32 8.298-14.716 14.935-7.934 14.57-8.607 16.919.58 16.928-.193 14.362 8.94 14.747 8.275 7.953 14.901 8.632 14.52-.574 16.874.187 16.883-8.965 14.323z"/>
+    <path d="M244.637 128.28c0 28.646-23.222 51.867-51.866 51.867s-51.867-23.221-51.867-51.866 23.222-51.866 51.867-51.866 51.866 23.221 51.866 51.866z" fill="#fff"/>
+  </g>
+</svg>

index.html

@@ -182,7 +182,7 @@
 			
 			<a data-toggle="tooltip" data-placement="bottom" data-original-title="Translations of privacytools.io were done by volunteers. They might be not up to date.">Language:</a>
 			
-			<span class="flag-icon flag-icon-cn" style="margin-left:5px;"></span> <a href="https://privacytools.twngo.xyz/">繁体中文</a> 
+			<span class="flag-icon flag-icon-tw" style="margin-left:5px;"></span> <a href="https://privacytools.twngo.xyz/">繁體中文</a> 
 			
 			<span class="flag-icon flag-icon-es" style="margin-left:5px;"></span> <a href="https://victorhck.gitlab.io/privacytools-es/">Español</a>
 			
@@ -190,9 +190,9 @@
 
 			<span style="margin-left:15px;">Darknet:</span>
 			
-			<a data-toggle="tooltip" data-placement="bottom" data-original-title="Requires specific software to access: torproject.org" href="http://privacygnk5vuzea.onion/ ">Tor</a>, 
+			<a data-toggle="tooltip" data-placement="bottom" data-original-title="Requires specific software to access: torproject.org" href="http://privacyh3rsehm64.onion/">Tor</a>, 
 			
-			<a data-toggle="tooltip" data-placement="bottom" data-original-title="Requires specific software to access: geti2p.net" href="http://privacytools.i2p/?i2paddresshelper=wfewiqkdt5bvowfp3igmkaksjvcvwj7bag2smqpqyu5x4hges2qa.b32.i2p">I2P</a>, 
+			<a data-toggle="tooltip" data-placement="bottom" data-original-title="Requires specific software to access: geti2p.net" href="http://privacytools.i2p/?i2paddresshelper=5GOHmoHjcG3c55VitD6OZmDHFpDfetZkwsgLUsq4EgM5SgJIFYYgxeDXFLJSrrUxjgD70bC-ZUKzGZ-hf8l4RUUrM7aUGCSC3Yk~tAZMIVMni6hDCw269GQRJUYrOeGX9Ufze2ln~gWssUsH8BErV1HHJ-FS2oKQZYR-rROEGRJ3ptR5LiZmsKgfcObU3Y4pBfK~yq9s~V7XV-7YD8v8eEjiEeyBVKKddeoguj~Uq9N2NsR4rm~FclpAZi2HS50wD4Ph96di7DxgKdk96uDHFeIQJzvdK6VPuvuX6jZUA-LVbwlnLM~~mh4hv5jT7w~KaJPkTFWRRO1~lrrhiS4WLjjBnhfAty7PZ4W4GSuJKPPGhLPF65Yz7Ji--T3p2ZLLkpjPbNpgokNAKHfOkr~uR7F1rjnkcRTi3ZzYciiALCJNwNgLEOXowuAbdLyM5GO3gXm27~PZpsttxvCBlHkmD8L2xinybADaDvrAe3ReWbi9zd9WMGm5zc2sfZ1G~1E1BQAEAAEAAA%3d%3d">I2P</a>, 
 			
 			<a data-toggle="tooltip" data-placement="bottom" data-original-title="Requires specific software to access: zeronet.io" href="http://127.0.0.1:43110/14gSEpfWfF5Go7u5y7UidZQCnGa6eSBYZ9/">ZeroNet</a>
 		</p>	
@@ -403,17 +403,6 @@
 								<td><a href="https://cryptostorm.is/">Cryptostorm.is</a></td>
 							</tr>
 
-							<tr>
-								<td data-value="Doublehop.me">
-									<a href="https://doublehop.me/"><img src="img/provider/Doublehop.me.gif" width="200" height="70"></a>
-								</td>
-								<td data-value="33">$ 33</td>
-								<td><span class="label label-warning">No</span></td>
-								<td>6</td>
-								<td><span class="flag-icon flag-icon-sc"></span> Seychelles</td>
-								<td><a href="https://doublehop.me/">Doublehop.me</a></td>
-							</tr>
-
 							<tr>
 								<td data-value="EarthVPN">
 									<a href="http://www.earthvpn.com/"><img src="img/provider/EarthVPN.gif" width="200" height="70"></a>
@@ -635,7 +624,7 @@
 			<li><a href="https://proxy.sh/canary">https://proxy.sh/canary</a></li>
 			<li><a href="https://www.ivpn.net/resources/canary.txt">https://www.ivpn.net/resources/canary.txt</a></li>
 			<li><a href="https://www.vpnsecure.me/files/canary.txt">https://www.vpnsecure.me/files/canary.txt</a></li>
-			<li><a href="https://www.bolehvpn.net/canary.html">https://www.bolehvpn.net/canary.html</a></li>
+			<li><a href="https://www.bolehvpn.net/canary.txt">https://www.bolehvpn.net/canary.txt</a></li>
 			<li><a href="https://lokun.is/canary.txt">https://lokun.is/canary.txt</a></li>
 			<li><a href="https://www.ipredator.se/static/downloads/canary.txt">https://www.ipredator.se/static/downloads/canary.txt</a></li>
 		</ol>
@@ -767,7 +756,7 @@
 		<!-- related information links -->
 		<h3>Related Information</h3>
 		<ul>
-			<li><a href="https://panopticlick.eff.org/browser-uniqueness.pdf">How Unique Is Your Web Browser? Peter Eckersley, EFF.</a></li>
+			<li><a href="https://panopticlick.eff.org/static/browser-uniqueness.pdf">How Unique Is Your Web Browser? Peter Eckersley, EFF.</a></li>
 			<li><a href="https://www.reddit.com/r/privacytoolsIO/comments/35pqyl/new_section_browser_fingerprint_is_your_browser/">Join our discussion on reddit.com about browser fingerprinting.</a></li>
 			<li><a href="#addons"><span class="glyphicon glyphicon-link"></span> Our Firefox privacy add-ons section.</a></li>
 			<li><a href="https://www.browserleaks.com/">BrowserLeaks.com</a> - Web browser security testing tools, that tell you what exactly personal identity data may be leaked without any permissions when you surf the Internet.</li>
@@ -1488,15 +1477,12 @@
 						<h3 class="panel-title">Mobile: Signal</h3>
 					</div>
 					<div class="panel-body">
-						<p><img src="img/tools/Open-Whisper-Systems.png" alt="Open Whisper Systems" align="right" style="margin-left:5px;">Signal is a mobile app developed by <a href="https://whispersystems.org/">Open Whisper Systems</a>. The app provides end-to-end encrypted
+						<p><img src="img/tools/Open-Whisper-Systems.png" alt="Open Whisper Systems" align="right" style="margin-left:5px;">Signal is a mobile app developed by Open Whisper Systems. The app provides instant messaging, as well as voice and video calling. 
-							instant messaging. Signal is free and open source, enabling anyone to verify its security by auditing the code. Encrypted group chats are also supported. The development team is supported by community donations and grants. There are no advertisements,
+							All communications are end-to-end encrypted. Signal is free and open source, enabling anyone to verify its security by auditing the code. The development team is supported by community donations and grants. There are no advertisements,
 							and it doesn't cost anything to use.</p>
 						<p>
-							<a href="https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms">
+							<a href="https://signal.org">
-								<button type="button" class="btn btn-success">Android: google.com</button>
+								<button type="button" class="btn btn-success">Download: signal.org</button>
-							</a>
-							<a href="https://itunes.apple.com/app/id874139669">
-								<button type="button" class="btn btn-success">iOS: apple.com</button>
 							</a>
 						</p>
 						<p>OS: Android, iOS.</p>
@@ -1504,8 +1490,27 @@
 				</div>
 			</div>
 
-			<div class="col-sm-4">
+   <div class="col-sm-4">
 				<div class="panel panel-info">
+					<div class="panel-heading">
+						<h3 class="panel-title">Wire</h3>
+					</div>
+					<div class="panel-body">
+						<p><img src="img/tools/wire.png" alt="WIRE SWISS GmbH" align="right" style="margin-left:5px;">Wire is an app developed by <a href="https://wire.com">WIRE SWISS GmbH</a>.
+       The Wire app allows users to exchange end-to-end encrypted instant messages, as well as make voice and video calls. Wire is free and open source, enabling anyone to verify its security by auditing the code. The development team is backed by Iconical and they will monetize in the future with premium features/services.</p>
+						<p>
+							<a href="https://get.wire.com">
+								<button type="button" class="btn btn-info">Download: get.wire.com</button>
+							</a>
+						</p>
+						<p>OS: Android, iOS, macOS, Windows, Linux, Web</p>
+					</div>
+				</div>
+			</div>
+
+
+			<div class="col-sm-4">
+				<div class="panel panel-warning">
 					<div class="panel-heading">
 						<h3 class="panel-title">Desktop: Ricochet</h3>
 					</div>
@@ -1515,7 +1520,7 @@
 							added to your contacts list.</p>
 						<p>
 							<a href="https://ricochet.im/">
-								<button type="button" class="btn btn-info">Download: ricochet.im</button>
+								<button type="button" class="btn btn-warning">Download: ricochet.im</button>
 							</a>
 						</p>
 						<p>OS: Windows, Mac, Linux.</p>
@@ -1523,27 +1528,10 @@
 				</div>
 			</div>
 
-			<div class="col-sm-4">
-				<div class="panel panel-warning">
-					<div class="panel-heading">
-						<h3 class="panel-title">Off-the-Record: ChatSecure</h3>
-					</div>
-					<div class="panel-body">
-						<p><img src="img/tools/ChatSecure.png" style="margin-left:5px;" align="right">ChatSecure is a free and open source messaging app that features OTR encryption over XMPP. You can connect to your existing account on Google, create new accounts
-							on public XMPP servers (including via Tor), or even connect to your own server for extra security. ChatSecure only uses well-known open source cryptographic libraries to keep your conversations private.</p>
-						<p>
-							<a href="https://www.chatsecure.org/">
-								<button type="button" class="btn btn-warning">Download: chatsecure.org</button>
-							</a>
-						</p>
-						<p>OS: Android, iOS.</p>
-					</div>
-				</div>
-			</div>
-
 		</div>
 		<h3>Worth Mentioning</h3>
 		<ul>
+   <li><a href="https://www.chatsecure.org">ChatSecure</a> - ChatSecure is a free and open source messaging app that features OTR encryption over XMPP. </li>
 			<li><a href="https://crypto.cat/">Cryptocat</a> - Encrypted open source messenger. Supports file sharing and multiple devices. Available for Windows, Linux and Mac.</li>
 			<li><a href="http://kontalk.org/">Kontalk</a> - A community-driven instant messaging network. Supports end-to-end encryption. Both client-to-server and server-to-server channels are fully encrypted.</li>
 			<li><a href="https://play.google.com/store/apps/details?id=eu.siacs.conversations">Conversations</a> - An open source Jabber/XMPP client for Android 4.0+ smart phones. Supports end-to-end encryption with either OMEMO, OTR or openPGP.</li>
@@ -1554,6 +1542,7 @@
 		<ul>
 			<li><a href="https://motherboard.vice.com/read/ricochet-encrypted-messenger-tackles-metadata-problem-head-on">Ricochet, the Messenger That Beats Metadata, Passes Security Audit | Motherboard</a></li>
 			<li><a href="https://firstlook.org/theintercept/2015/07/14/communicating-secret-watched/">Chatting in Secret While We're All Being Watched - firstlook.org</a></li>
+			<li><a href="https://signal.org/android/apk/">Advanced users with special needs can download the Signal APK directly. Most users should not do this under normal circumstances.</a></li>
 		</ul>
 
 		<a class="anchor" name="voip"></a>
@@ -1567,18 +1556,16 @@
 			<div class="col-sm-4">
 				<div class="panel panel-success">
 					<div class="panel-heading">
-						<h3 class="panel-title">Signal for Mobile</h3>
+						<h3 class="panel-title">Mobile: Signal</h3>
 					</div>
 
 					<div class="panel-body">
-						<p><img src="img/tools/Open-Whisper-Systems.png" alt="Open Whisper Systems" align="right" style="margin-left:5px;">Signal is a mobile app developed by <a href="https://whispersystems.org/">Open Whisper Systems</a>. The app provides end-to-end encryption
+						<p><img src="img/tools/Open-Whisper-Systems.png" alt="Open Whisper Systems" align="right" style="margin-left:5px;">Signal is a mobile app developed by Open Whisper Systems. The app provides instant messaging, as well as voice and video calling. 
-							for your calls. Signal is free and open source, enabling anyone to verify its security by auditing the code.</p>
+							All communications are end-to-end encrypted. Signal is free and open source, enabling anyone to verify its security by auditing the code. The development team is supported by community donations and grants. There are no advertisements,
+							and it doesn't cost anything to use.</p>
 						<p>
-							<a href="https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms">
+							<a href="https://signal.org">
-								<button type="button" class="btn btn-success">Android: google.com</button>
+								<button type="button" class="btn btn-success">Download: signal.org</button>
-							</a>
-							<a href="https://itunes.apple.com/app/id874139669">
-								<button type="button" class="btn btn-success">iOS: apple.com</button>
 							</a>
 						</p>
 						<p>OS: iOS, Android.</p>
@@ -1586,8 +1573,26 @@
 				</div>
 			</div>
 
-			<div class="col-sm-4">
+   <div class="col-sm-4">
 				<div class="panel panel-info">
+					<div class="panel-heading">
+						<h3 class="panel-title">Wire</h3>
+					</div>
+					<div class="panel-body">
+						<p><img src="img/tools/wire.png" alt="WIRE SWISS GmbH" align="right" style="margin-left:5px;">Wire is a app developed by <a href="https://wire.com">WIRE SWISS GmbH</a>.
+       The Wire app allows users to exchange end-to-end encrypted instant messages, as well as make voice and video calls. Wire is free and open source, enabling anyone to verify its security by auditing the code. The development team is backed by Iconical and they will monetize in the future with premium features/services.</p>
+						<p>
+							<a href="https://get.wire.com">
+								<button type="button" class="btn btn-info">Download: get.wire.com</button>
+							</a>
+						</p>
+						<p>OS: Android, iOS, macOS, Windows, Linux, Web</p>
+					</div>
+				</div>
+			</div>
+
+			<div class="col-sm-4">
+				<div class="panel panel-warning">
 					<div class="panel-heading">
 						<h3 class="panel-title">Linphone</h3>
 					</div>
@@ -1596,39 +1601,29 @@
 							end-to-end encrypted voice and video communication.</p>
 						<p>
 							<a href="http://www.linphone.org/">
-								<button type="button" class="btn btn-info">Download: linphone.org</button>
+								<button type="button" class="btn btn-warning">Download: linphone.org</button>
 							</a>
 						</p>
 						<p>OS: iOS, Android, Windows Phone, Linux, Windows, Mac, Browser (Web)</p>
 					</div>
 				</div>
 			</div>
-			<div class="col-sm-4">
+
-				<div class="panel panel-warning">
-					<div class="panel-heading">
-						<h3 class="panel-title">Jitsi</h3>
-					</div>
-					<div class="panel-body">
-						<p><img src="img/tools/Jitsi.png" alt="Jitsi" align="right" style="margin-left:5px;">Jitsi is a free and open source multiplatform voice (VoIP), videoconferencing and instant messaging application. It supports several popular instant-messaging and
-							telephony protocols, including open recognised encryption protocols for chat (OTR).</p>
-						<p>
-							<a href="https://jitsi.org/">
-								<button type="button" class="btn btn-warning">Download: jitsi.org</button>
-							</a>
-						</p>
-						<p>OS: Windows, Mac, Linux.</p>
-					</div>
-				</div>
-			</div>
 		</div>
 
 
 		<h3>Worth Mentioning</h3>
 		<ul>
+			<li><a href="https://jitsi.org/">Jitsi</a> - Jitsi is a free and open source multiplatform voice (VoIP), videoconferencing and instant messaging application.</li>
 			<li><a href="https://tox.chat/">Tox</a> - A free and open-source, peer-to-peer, encrypted instant messaging and video calling software.</li>
 			<li><a href="http://www.ring.cx/">Ring (formerly SFLphone)</a> - Gives you a full control over your communications and an unmatched level of privacy.</li>
 		</ul>
 
+		<h3>Related Information</h3>
+		<ul>
+			<li><a href="https://signal.org/android/apk/">Advanced users with special needs can download the Signal APK directly. Most users should not do this under normal circumstances.</a></li>
+		</ul>
+
 		<a class="anchor" name="cloud"></a>
 		<div class="page-header">
 			<h1><a href="#cloud" class="titleanchor"><span class="glyphicon glyphicon-link"></span></a> Encrypted Cloud Storage Services</h1>
@@ -1876,27 +1871,6 @@
 					</div>
 				</div>
 			</div>
-
-			<div class="col-sm-4">
-				<div class="panel panel-warning">
-					<div class="panel-heading">
-						<h3 class="panel-title">Encryptr - Cloud Based</h3>
-					</div>
-					<div class="panel-body">
-						<p><img src="img/tools/Encryptr.png" alt="Encryptr" align="right" style="margin-left:5px;">Encryptr is simple and easy to use. It stores your sensitive data like passwords, credit card data, PINs, or access codes, in the cloud. However, because it
-							was built on the zero knowledge Crypton framework, Encryptr ensures that only the user has the ability to access or read the confidential information.</p>
-						<p>
-							<a href="https://spideroak.com/solutions/encryptr">
-								<button type="button" class="btn btn-warning">Website: spideroak.com</button>
-							</a>
-						</p>
-						<p>OS: Windows, Mac, Linux, Android.</p>
-					</div>
-				</div>
-			</div>
-
-
-
 		</div>
 
 		<h3>Worth Mentioning</h3>