Merge branch 'master' into 1158

This commit is contained in:
Jonah Aragon 2019-08-14 19:07:02 -05:00 committed by GitHub
commit 9b3ba83c5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 139 additions and 181 deletions

View File

@ -40,10 +40,6 @@
<a href="https://fruux.com/">fruux</a> - a unified contacts/calendaring system that works across platforms and devices.
</li>
<li>
<a href="https://signal.org/blog/flock/">Flock</a> - a discontinued calendar and contacts sync service by Open Whisper Systems. Despite being shut down the <a href="https://github.com/signalapp/Flock">source code</a> is still available on GitHub.
</li>
<li>
<a href="../cloud">cloud backups</a> - consider regularly exporting your calendar and or contacts and backing them up on a separate storage drive or uploading them to cloud storage (ideally after <a href="../encryption-tools/#encrypt">encrypting</a> them).
</li>

View File

@ -8,7 +8,7 @@
<table class="table sortable-theme-bootstrap" data-sortable>
<thead>
<tr>
<th data-sorted="true" data-sorted-direction="descending">Email Provider</th>
<th data-sorted="true" data-sorted-direction="ascending">Email Provider</th>
<th data-sortable="false">Website</th>
<th data-sortable="true">Since</th>
<th data-sortable="true">Jurisdiction</th>
@ -23,7 +23,104 @@
<tbody>
<tr>
<td data-value="ProtonMail">
<td data-value="disroot">
<img alt="Disroot" src="/assets/img/provider/disroot.org.png" width="200" height="70">
</td>
<td>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://disroot.org" href="https://disroot.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
</td>
<td data-value="2015">2015</td>
<td><span class="flag-icon flag-icon-nl"></span> Netherlands</td>
<td data-value="1000">1 GB</td>
<td data-value="1"><span class="label label-warning">Free</span></td>
<td data-value="1"><span class="label label-success">Accepted</span></td>
<td data-value="1"><span class="label label-success">Built-in</span></td>
<td data-value="1"><span class="label label-success">Yes</span></td>
</tr>
<tr>
<td data-value="kolabnow">
<img alt="Kolab Now" src="/assets/img/provider/Kolab-Now.png" width="200" height="70">
</td>
<td>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://kolabnow.com" href="https://kolabnow.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
</td>
<td data-value="2010">2010</td>
<td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
<td data-value="2048">2 GB</td>
<td data-value="6000">$ 60</td>
<td data-value="1"><span class="label label-success">Accepted</span></td>
<td data-value="0"><span class="label label-primary">No</span></td>
<td data-value="1"><span class="label label-success">Yes</span></td>
</tr>
<tr>
<td data-value="mailbox">
<img alt="mailbox.org" src="/assets/img/provider/mailbox.org.png" width="200" height="70">
</td>
<td>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailbox.org" href="https://mailbox.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35 "height="35"></a>
</td>
<td data-value="2014">2014</td>
<td><span class="flag-icon flag-icon-de"></span> Germany</td>
<td data-value="2000">2 GB</td>
<td data-value="1444">12 €</td>
<td data-value="1"><span class="label label-success">Accepted</span></td>
<td data-value="1"><span class="label label-success">Built-in</span></td>
<td data-value="1"><span class="label label-success">Yes</span></td>
</tr>
<tr>
<td data-value="mailfence">
<img alt="Mailfence" src="/assets/img/provider/Mailfence.png" width="200" height="70">
</td>
<td>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailfence.com" href="https://mailfence.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
</td>
<td data-value="2013">2013</td>
<td><span class="flag-icon flag-icon-be"></span> Belgium</td>
<td data-value="500">500 MB</td>
<td data-value="0"><span class="label label-warning">Free</span></td>
<td data-value="1"><span class="label label-success">Accepted</span></td>
<td data-value="1"><span class="label label-success">Built-in</span></td>
<td data-value="1"><span class="label label-success">Yes</span></td>
</tr>
<tr>
<td data-value="neomailbox">
<img alt="Neomailbox" src="/assets/img/provider/Neomailbox.png" width="200" height="70">
</td>
<td>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.neomailbox.com" href="https://www.neomailbox.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
</td>
<td data-value="2003">2003</td>
<td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
<td data-value="1000">1 GB</td>
<td data-value="4995">$ 49.95</td>
<td data-value="1"><span class="label label-success">Accepted</span></td>
<td data-value="1"><span class="label label-success">Built-in</span></td>
<td data-value="1"><span class="label label-success">Yes</span></td>
</tr>
<tr>
<td data-value="posteo">
<img alt="Posteo" src="/assets/img/provider/Posteo.png" width="200" height="70">
</td>
<td>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://posteo.de" href="https://posteo.de"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
</td>
<td data-value="2009">2009</td>
<td><span class="flag-icon flag-icon-de"></span> Germany</td>
<td data-value="2000">2 GB</td>
<td data-value="1444">12 €</td>
<td data-value="0"><span class="label label-primary">No</span></td>
<td data-value="1"><span class="label label-success">Built-in</span></td>
<td data-value="0"><span class="label label-primary">No</span></td>
</tr>
<tr>
<td data-value="protonmail">
<img alt="Protonmail" src="/assets/img/provider/ProtonMail.ch.png" width="200" height="70">
</td>
<td>
@ -40,23 +137,56 @@
</tr>
<tr>
<td data-value="disroot.org">
<img alt="Disroot" src="/assets/img/provider/disroot.org.png" width="200" height="70">
<td data-value="runbox">
<img alt="Runbox" src="/assets/img/provider/runbox.png" width="200" height="70">
</td>
<td>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://disroot.org" href="https://disroot.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://runbox.com" href="https://runbox.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
</td>
<td data-value="1999">1999</td>
<td><span class="flag-icon flag-icon-no"></span> Norway</td>
<td data-value="1000">1 GB</td>
<td data-value="1995">$ 19.95</td>
<td data-value="1"><span class="label label-primary">Accepted</span></td>
<td data-value="0"><span class="label label-primary">No</span></td>
<td data-value="1"><span class="label label-success">Yes</span></td>
</tr>
<tr>
<td data-value="soverin">
<img alt="Soverin" src="/assets/img/provider/Soverin.png" width="200" height="70">
</td>
<td>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://soverin.net/" href="https://soverin.net/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
</td>
<td data-value="2015">2015</td>
<td><span class="flag-icon flag-icon-nl"></span> Netherlands</td>
<td data-value="1000">1 GB</td>
<td data-value="1"><span class="label label-warning">Free</span></td>
<td data-value="1"><span class="label label-success">Accepted</span></td>
<td data-value="25000">25 GB</td>
<td data-value="3489">29 €</td>
<td data-value="0"><span class="label label-success">No</span></td>
<td data-value="0"><span class="label label-success">No</span></td>
<td data-value="1"><span class="label label-success">Yes</span></td>
</tr>
<tr>
<td data-value="startmail">
<img alt="StartMail" src="/assets/img/provider/StartMail.png" width="200" height="70">
</td>
<td>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.startmail.com" href="https://www.startmail.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
</td>
<td data-value="2014">2014</td>
<td><span class="flag-icon flag-icon-nl"></span> Netherlands</td>
<td data-value="10000">10 GB</td>
<td data-value="5995">$ 59.95</td>
<td data-value="0"><span class="label label-success">Accepted</span></td>
<td data-value="1"><span class="label label-success">Built-in</span></td>
<td data-value="1"><span class="label label-success">Yes</span></td>
</tr>
<tr>
<td data-value="Tutanota">
<td data-value="tutanota">
<img alt="Tutanota" src="/assets/img/provider/Tutanota.png" width="200" height="70">
</td>
<td>
@ -71,136 +201,6 @@
<td data-value="1"><span class="label label-success">Yes</span></td>
</tr>
<tr>
<td data-value="Mailfence">
<img alt="Mailfence" src="/assets/img/provider/Mailfence.png" width="200" height="70">
</td>
<td>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailfence.com" href="https://mailfence.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
</td>
<td data-value="2013">2013</td>
<td><span class="flag-icon flag-icon-be"></span> Belgium</td>
<td data-value="500">500 MB</td>
<td data-value="0"><span class="label label-warning">Free</span></td>
<td data-value="1"><span class="label label-success">Accepted</span></td>
<td data-value="1"><span class="label label-success">Built-in</span></td>
<td data-value="1"><span class="label label-success">Yes</span></td>
</tr>
<tr>
<td data-value="mailbox.org">
<img alt="mailbox.org" src="/assets/img/provider/mailbox.org.png" width="200" height="70">
</td>
<td>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailbox.org" href="https://mailbox.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35 "height="35"></a>
</td>
<td data-value="2014">2014</td>
<td><span class="flag-icon flag-icon-de"></span> Germany</td>
<td data-value="2000">2 GB</td>
<td data-value="13">12 €</td>
<td data-value="1"><span class="label label-success">Accepted</span></td>
<td data-value="1"><span class="label label-success">Built-in</span></td>
<td data-value="1"><span class="label label-success">Yes</span></td>
</tr>
<tr>
<td data-value="Posteo">
<img alt="Posteo" src="/assets/img/provider/Posteo.png" width="200" height="70">
</td>
<td>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://posteo.de" href="https://posteo.de"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
</td>
<td data-value="2009">2009</td>
<td><span class="flag-icon flag-icon-de"></span> Germany</td>
<td data-value="2000">2 GB</td>
<td data-value="13">12 €</td>
<td data-value="0"><span class="label label-primary">No</span></td>
<td data-value="1"><span class="label label-success">Built-in</span></td>
<td data-value="0"><span class="label label-primary">No</span></td>
</tr>
<tr>
<td data-value="Runbox">
<img alt="Runbox" src="/assets/img/provider/runbox.png" width="200" height="70">
</td>
<td>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://runbox.com" href="https://runbox.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
</td>
<td data-value="1999">1999</td>
<td><span class="flag-icon flag-icon-no"></span> Norway</td>
<td data-value="1000">1 GB</td>
<td data-value="20">$ 19.95</td>
<td data-value="1"><span class="label label-primary">Accepted</span></td>
<td data-value="0"><span class="label label-primary">No</span></td>
<td data-value="1"><span class="label label-success">Yes</span></td>
</tr>
<tr>
<td data-value="Neomailbox">
<img alt="Neomailbox" src="/assets/img/provider/Neomailbox.png" width="200" height="70">
</td>
<td>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.neomailbox.com" href="https://www.neomailbox.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
</td>
<td data-value="2003">2003</td>
<td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
<td data-value="1000">1 GB</td>
<td data-value="50">$ 49.95</td>
<td data-value="1"><span class="label label-success">Accepted</span></td>
<td data-value="1"><span class="label label-success">Built-in</span></td>
<td data-value="1"><span class="label label-success">Yes</span></td>
</tr>
<tr>
<td data-value="Soverin">
<img alt="Soverin" src="/assets/img/provider/Soverin.png" width="200" height="70">
</td>
<td>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://soverin.net/" href="https://soverin.net/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
</td>
<td data-value="2015">2015</td>
<td><span class="flag-icon flag-icon-nl"></span> Netherlands</td>
<td data-value="25000">25 GB</td>
<td data-value="35">29 €</td>
<td data-value="0"><span class="label label-success">No</span></td>
<td data-value="1"><span class="label label-success">No</span></td>
<td data-value="1"><span class="label label-success">Yes</span></td>
</tr>
<tr>
<td data-value="StartMail">
<img alt="StartMail" src="/assets/img/provider/StartMail.png" width="200" height="70">
</td>
<td>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.startmail.com" href="https://www.startmail.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
</td>
<td data-value="2014">2014</td>
<td><span class="flag-icon flag-icon-nl"></span> Netherlands</td>
<td data-value="10000">10 GB</td>
<td data-value="60">$ 59.95</td>
<td data-value="0"><span class="label label-success">Accepted</span></td>
<td data-value="1"><span class="label label-success">Built-in</span></td>
<td data-value="1"><span class="label label-success">Yes</span></td>
</tr>
<tr>
<td data-value="Kolab Now">
<img alt="Kolab Now" src="/assets/img/provider/Kolab-Now.png" width="200" height="70">
</td>
<td>
<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://kolabnow.com" href="https://kolabnow.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
</td>
<td data-value="2010">2010</td>
<td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
<td data-value="2048">2 GB</td>
<td data-value="60">$ 60</td>
<td data-value="1"><span class="label label-success">Accepted</span></td>
<td data-value="0"><span class="label label-primary">No</span></td>
<td data-value="1"><span class="label label-success">Yes</span></td>
</tr>
</tbody>
</table>
</div>

View File

@ -59,49 +59,13 @@ web=""
<li><a href="https://www.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://keybase.io/">Keybase</a> - <span class="badge badge-warning" data-toggle="tooltip" title="This software relies on a closed-source central server.">Warning</span> End-to-end encrypted messaging with social verification.</li>
<li><a href="https://status.im/">Status</a> - <span class="badge badge-warning">Experimental</span> A free and open-source, peer-to-peer, encrypted instant messanger with support for DAPPs.</li>
<li><a href="https://ricochet.im/">Ricochet</a> - <span class="badge badge-danger" data-toggle="tooltip" title="This software is safe if you manually keep Tor up to date."><a href="#ricochetTor" class="text-white">Danger</a></span> <span class="badge badge-warning" data-toggle="tooltip" title="This software is considered safe but experimental and the client has not been updated since 2016."><a href="https://github.com/ricochet-im/ricochet#experimental">Experimental</a></span> Ricochet uses the <a href="/browsers/#browser"><i class="fas fa-link"></i> Tor network</a> to reach your contacts without relying on messaging servers. It creates a hidden service, which is used to rendezvous with your contacts without revealing your location or IP address.</li>
</ul>
<h3>Related Information</h3>
<ul>
<li><a href="https://www.vice.com/en_us/article/mg7v3a/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>
<!-- Updating the Tor binary included with Ricochet -->
<h3 id="ricochetTor" class="anchor"><a href="#ricochetTor"><i class="fas fa-link anchor-icon"></i></a> Updating the Tor binary included with Ricochet</h3>
Currently there are no known vulnerabilities with Ricochet. The software is safe to use as long as you update the included Tor binary to the latest version.
<ol class="long-string-list">
<li>Download the <a href="/browsers/#browser"><i class="fas fa-link"></i> Tor Browser</a>.</li>
<li>Run the Tor Browser installer or extract package for your platform. Windows (.exe), MacOSX (.dmg) and Linux (.tar.bz2).</li>
<li>Copy the Tor binary or create a symbolic link to it: </li>
<br>
<ul>
<li><strong>Windows: </strong>Copy the Tor binary included with the Tor Browser and overwrite the old one included with Ricochet.</li>
<ul>
<li>Tor Browser binary: <code>%HOMEPATH%\Desktop\Tor Browser\Browser\TorBrowser\Tor\tor.exe</code></li>
<li>Ricochet's included binary: <code>%HOMEPATH%\Desktop\Ricochet\tor.exe</code></li>
</ul>
<br>
<li><strong>MacOSX: </strong>Assuming you copied the <code>Tor Browser.app</code> and <code>Ricochet.app</code> from their respective .dmg install media to <code>/Applications</code>: <br>
Create a symbolic link to the Tor binary in Terminal. Ricochet will continue to use the up to date version of the Tor binary when you update the Tor Browser Bundle.</li>
<ul>
<li><code>rm ~/Applications/Ricochet.app/Contents/MacOS/tor <br>
ln -s ~/Applications/Tor\ Browser.app/Contents/Resources/TorBrowser/Tor/tor \ <br>
~/Applications/Ricochet.app/Contents/MacOS/tor</code>
</li>
</ul>
<br>
<li><strong>Linux: </strong>Assuming you extracted the Tor Browser Bundle and Ricochet tarball to your home directory:</li>
<ul>
<li><code>rm ~/ricochet/tor <br>
ln -s ~/tor-browser_en-US/Browser/TorBrowser/Tor/tor ~/ricochet/tor</code>
</li>
</ul>
<ul>
</ol>

View File

@ -134,8 +134,6 @@ Backend: closed-source
Status.im: https://github.com/status-im
Ricochet: https://github.com/ricochet-im/ricochet
## Team chat
Rocket.chat: https://github.com/rocketchat/