index.html

@@ -806,7 +806,7 @@
 		<img src="img/addons/Disconnect.gif" class="img-responsive pull-left" alt="Disconnect" style="margin-right:30px;">
 		<p>Founded in 2011 by former Google engineers and a consumer-and privacy-rights attorney. The addon is open source and loads the pages you go to 27% faster and stops tracking by 2,000+ third-party sites. It also keeps your searches private. If you are planning to install "uBlock Origin" make sure to install "Disconnect" first. <strong>Alternative to Disconnect:</strong> <a href="https://addons.mozilla.org/firefox/addon/privacy-badger-firefox/">Privacy Badger by EFF</a>
 			<br />
-			<a href="https://addons.mozilla.org/firefox/addon/disconnect/">https://addons.mozilla.org/firefox/addon/disconnect/</a> 
+			<a href="https://addons.mozilla.org/firefox/addon/disconnect/">https://addons.mozilla.org/firefox/addon/disconnect/</a>
 			</p>
 
 		<h3>Block Ads with "uBlock Origin"</h3>
@@ -1417,7 +1417,7 @@
 				</div>
 			</div>
 		</div>
-		
+
 		<h3>Firefox Addon</h3>
 		<ul>
 						<li>
@@ -1493,14 +1493,13 @@
 			<div class="col-sm-4">
 				<div class="panel panel-warning">
 					<div class="panel-heading">
-						<h3 class="panel-title">Off-the-Record: ChatSecure</h3>
+						<h3 class="panel-title">Conversations</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><img src="img/tools/conversations.png" style="margin-left:5px;" align="right">Conversations is a free instant messaging client for Android. It supports the exchange of encrypted text and picture messages. It is largely based on accepted open standards like the Extensible Messaging and Presence Protocol (XMPP), Transport Layer Security (TLS), and Off-the-Record Messaging (OTR).</p>
 						<p>
-							<a href="https://www.chatsecure.org/">
-								<button type="button" class="btn btn-warning">Download: www.chatsecure.org</button>
+							<a href="https://conversations.im/">
+								<button type="button" class="btn btn-warning">Download: https://conversations.im/</button>
 							</a>
 						</p>
 						<p>OS: iOS, Android, <a href="https://en.wikipedia.org/wiki/Off-the-Record_Messaging#Client_support">other OTR Clients.</a></p>
@@ -1891,15 +1890,15 @@
 		<ul>
 			<li><a href="https://www.youtube.com/watch?v=yzGzB-yYKcc">Edward Snowden on Passwords - YouTube</a></li>
 		</ul>
-		
+
 		<a class="anchor" name="kdl"></a>
 		<h3>Key disclosure law - Who is required to hand over the encryption keys to authorities?</h3>
 		<p>Mandatory key disclosure laws require individuals to turn over encryption keys to law enforcement conducting a criminal investigation. How these laws are implemented (who may be legally compelled to assist) vary from nation to nation, but a warrant
 			is generally required. Defenses against key disclosure laws include steganography and encrypting data in a way that provides plausible deniability.</p>
 
 		<p>Steganography involves hiding sensitive information (which may be encrypted) inside of ordinary data (for example, encrypting an image file and then hiding it in an audio file). With plausible deniability, data is encrypted in a way that prevents an
-			adversary from being able to prove that the information they are after exists (for example, one password may decrypt benign data and another password, used on the same file, could decrypt sensitive data).</p>		
-		
+			adversary from being able to prove that the information they are after exists (for example, one password may decrypt benign data and another password, used on the same file, could decrypt sensitive data).</p>
+
 		<a class="anchor" name="encrypt"></a>
 		<div class="page-header">
 			<h1><a href="#encrypt" class="titleanchor"><span class="glyphicon glyphicon-link"></span></a> File Encryption Software</h1>