1
0
Fork 0

Resovles conflicts

This commit is contained in:
Alicia Sykes 2023-03-04 20:41:32 +00:00
parent 57ab9ef6fc
commit 5aa42a39d9
4 changed files with 105 additions and 77 deletions

132
.github/CREDITS.md vendored
View file

@ -90,6 +90,13 @@
</a>
</td></tr>
<tr>
<td align="center">
<a href="https://github.com/iJasonWade">
<img src="https://avatars.githubusercontent.com/u/12824479?u=8fa860e47bed4f84c8ff70cb2691d77edbb43d8f&v=4" width="80;" alt="iJasonWade"/>
<br />
<sub><b>Jason Ash</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/PAPAMICA">
<img src="https://avatars.githubusercontent.com/u/29079741?v=4" width="80;" alt="PAPAMICA"/>
@ -98,10 +105,10 @@
</a>
</td>
<td align="center">
<a href="https://github.com/shadowking001">
<img src="https://avatars.githubusercontent.com/u/43928955?u=a00b44f22e5a82234d9b406ac048def1fbc16e31&v=4" width="80;" alt="shadowking001"/>
<a href="https://github.com/DRXAquosus">
<img src="https://avatars.githubusercontent.com/u/45409262?v=4" width="80;" alt="DRXAquosus"/>
<br />
<sub><b>LawrenceP.</b></sub>
<sub><b>DRXAquosus</b></sub>
</a>
</td>
<td align="center">
@ -156,8 +163,8 @@
</a>
</td>
<td align="center">
<a href="https://github.com/ltGuillaume">
<img src="https://avatars.githubusercontent.com/u/4777345?v=4" width="80;" alt="ltGuillaume"/>
<a href="https://github.com/ltguillaume">
<img src="https://avatars.githubusercontent.com/u/4777345?v=4" width="80;" alt="ltguillaume"/>
<br />
<sub><b>Guillaume</b></sub>
</a>
@ -184,6 +191,13 @@
<sub><b>Kerbless</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/AlexOgden">
<img src="https://avatars.githubusercontent.com/u/1379601?v=4" width="80;" alt="AlexOgden"/>
<br />
<sub><b>Alex Ogden</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/samsapti">
<img src="https://avatars.githubusercontent.com/u/26819407?v=4" width="80;" alt="samsapti"/>
@ -199,20 +213,20 @@
</a>
</td>
<td align="center">
<a href="https://github.com/AlexOgden">
<img src="https://avatars.githubusercontent.com/u/1379601?v=4" width="80;" alt="AlexOgden"/>
<a href="https://github.com/GhoulBoii">
<img src="https://avatars.githubusercontent.com/u/78494833?v=4" width="80;" alt="GhoulBoii"/>
<br />
<sub><b>Alex Ogden</b></sub>
<sub><b>GhoulBoi69</b></sub>
</a>
</td>
</td></tr>
<tr>
<td align="center">
<a href="https://github.com/AshboDev">
<img src="https://avatars.githubusercontent.com/u/14421977?v=4" width="80;" alt="AshboDev"/>
<br />
<sub><b>Ash Scott</b></sub>
</a>
</td></tr>
<tr>
</td>
<td align="center">
<a href="https://github.com/BrunoBernardino">
<img src="https://avatars.githubusercontent.com/u/1239616?v=4" width="80;" alt="BrunoBernardino"/>
@ -220,13 +234,6 @@
<sub><b>Bruno Bernardino</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/GhoulBoii">
<img src="https://avatars.githubusercontent.com/u/78494833?v=4" width="80;" alt="GhoulBoii"/>
<br />
<sub><b>GhoulBoi69</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/Gusted">
<img src="https://avatars.githubusercontent.com/u/25481501?v=4" width="80;" alt="Gusted"/>
@ -284,21 +291,28 @@
<sub><b>Wesley-Ryan</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/ZhymabekRoman">
<img src="https://avatars.githubusercontent.com/u/61125068?v=4" width="80;" alt="ZhymabekRoman"/>
<br />
<sub><b>Zhymabek Roman</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/baddate">
<img src="https://avatars.githubusercontent.com/u/37013819?v=4" width="80;" alt="baddate"/>
<br />
<sub><b>Alex</b></sub>
</a>
</td>
</td></tr>
<tr>
<td align="center">
<a href="https://github.com/colenh">
<img src="https://avatars.githubusercontent.com/u/40342475?v=4" width="80;" alt="colenh"/>
<br />
<sub><b>Cole</b></sub>
</a>
</td></tr>
<tr>
</td>
<td align="center">
<a href="https://github.com/jxhn">
<img src="https://avatars.githubusercontent.com/u/1396009?v=4" width="80;" alt="jxhn"/>
@ -427,7 +441,7 @@ _Awesome-Privacy originated from [Personal-Security-Checklist](https://github.co
<a href="https://github.com/pndyjack">
<img src="https://avatars.githubusercontent.com/u/20967911?v=4" width="80;" alt="pndyjack"/>
<br />
<sub><b>Jaimin</b></sub>
<sub><b>Pndyjack</b></sub>
</a>
</td></tr>
<tr>
@ -466,14 +480,21 @@ _Awesome-Privacy originated from [Personal-Security-Checklist](https://github.co
<sub><b>Ansuz</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/hypogram">
<img src="https://avatars.githubusercontent.com/u/122231081?v=4" width="80;" alt="hypogram"/>
<br />
<sub><b>Hypogram</b></sub>
</a>
</td></tr>
<tr>
<td align="center">
<a href="https://github.com/marjamis">
<img src="https://avatars.githubusercontent.com/u/10202014?v=4" width="80;" alt="marjamis"/>
<br />
<sub><b>Marjamis</b></sub>
</a>
</td></tr>
<tr>
</td>
<td align="center">
<a href="https://github.com/rusty-snake">
<img src="https://avatars.githubusercontent.com/u/41237666?v=4" width="80;" alt="rusty-snake"/>
@ -508,15 +529,15 @@ _Awesome-Privacy originated from [Personal-Security-Checklist](https://github.co
<br />
<sub><b>Adv4n6</b></sub>
</a>
</td>
</td></tr>
<tr>
<td align="center">
<a href="https://github.com/andydonzelli">
<img src="https://avatars.githubusercontent.com/u/6990701?v=4" width="80;" alt="andydonzelli"/>
<br />
<sub><b>Andy Donzelli</b></sub>
</a>
</td></tr>
<tr>
</td>
<td align="center">
<a href="https://github.com/austinhuang0131">
<img src="https://avatars.githubusercontent.com/u/16656689?v=4" width="80;" alt="austinhuang0131"/>
@ -551,15 +572,15 @@ _Awesome-Privacy originated from [Personal-Security-Checklist](https://github.co
<br />
<sub><b>Christian Hemminghaus</b></sub>
</a>
</td>
</td></tr>
<tr>
<td align="center">
<a href="https://github.com/DaShoe">
<img src="https://avatars.githubusercontent.com/u/89014564?v=4" width="80;" alt="DaShoe"/>
<br />
<sub><b>DaShoe</b></sub>
</a>
</td></tr>
<tr>
</td>
<td align="center">
<a href="https://github.com/danielgtaylor">
<img src="https://avatars.githubusercontent.com/u/106826?v=4" width="80;" alt="danielgtaylor"/>
@ -567,6 +588,13 @@ _Awesome-Privacy originated from [Personal-Security-Checklist](https://github.co
<sub><b>Daniel G. Taylor</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/dim1119">
<img src="https://avatars.githubusercontent.com/u/10008788?v=4" width="80;" alt="dim1119"/>
<br />
<sub><b>Dimitris Lazarakis</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/VoDmAl">
<img src="https://avatars.githubusercontent.com/u/248879?v=4" width="80;" alt="VoDmAl"/>
@ -585,9 +613,10 @@ _Awesome-Privacy originated from [Personal-Security-Checklist](https://github.co
<a href="https://github.com/Z4rak">
<img src="https://avatars.githubusercontent.com/u/65371336?v=4" width="80;" alt="Z4rak"/>
<br />
<sub><b>Z4rak</b></sub>
<sub><b>Felipe</b></sub>
</a>
</td>
</td></tr>
<tr>
<td align="center">
<a href="https://github.com/fkohrt">
<img src="https://avatars.githubusercontent.com/u/12914806?v=4" width="80;" alt="fkohrt"/>
@ -601,8 +630,7 @@ _Awesome-Privacy originated from [Personal-Security-Checklist](https://github.co
<br />
<sub><b>Freddy</b></sub>
</a>
</td></tr>
<tr>
</td>
<td align="center">
<a href="https://github.com/hw4n">
<img src="https://avatars.githubusercontent.com/u/38372575?v=4" width="80;" alt="hw4n"/>
@ -630,7 +658,8 @@ _Awesome-Privacy originated from [Personal-Security-Checklist](https://github.co
<br />
<sub><b>Gemini Smith</b></sub>
</a>
</td>
</td></tr>
<tr>
<td align="center">
<a href="https://github.com/monkeywithacupcake">
<img src="https://avatars.githubusercontent.com/u/7316730?v=4" width="80;" alt="monkeywithacupcake"/>
@ -644,8 +673,7 @@ _Awesome-Privacy originated from [Personal-Security-Checklist](https://github.co
<br />
<sub><b>John Karahalis</b></sub>
</a>
</td></tr>
<tr>
</td>
<td align="center">
<a href="https://github.com/edelbluth">
<img src="https://avatars.githubusercontent.com/u/4939388?v=4" width="80;" alt="edelbluth"/>
@ -673,7 +701,8 @@ _Awesome-Privacy originated from [Personal-Security-Checklist](https://github.co
<br />
<sub><b>Kazuki Koide</b></sub>
</a>
</td>
</td></tr>
<tr>
<td align="center">
<a href="https://github.com/Kotbenek">
<img src="https://avatars.githubusercontent.com/u/64036903?v=4" width="80;" alt="Kotbenek"/>
@ -687,8 +716,7 @@ _Awesome-Privacy originated from [Personal-Security-Checklist](https://github.co
<br />
<sub><b>Leon Costa</b></sub>
</a>
</td></tr>
<tr>
</td>
<td align="center">
<a href="https://github.com/lukecarr">
<img src="https://avatars.githubusercontent.com/u/24438483?v=4" width="80;" alt="lukecarr"/>
@ -716,7 +744,8 @@ _Awesome-Privacy originated from [Personal-Security-Checklist](https://github.co
<br />
<sub><b>Nick Ali</b></sub>
</a>
</td>
</td></tr>
<tr>
<td align="center">
<a href="https://github.com/Oymate">
<img src="https://avatars.githubusercontent.com/u/50857856?v=4" width="80;" alt="Oymate"/>
@ -730,8 +759,7 @@ _Awesome-Privacy originated from [Personal-Security-Checklist](https://github.co
<br />
<sub><b>Pedro Delfino</b></sub>
</a>
</td></tr>
<tr>
</td>
<td align="center">
<a href="https://github.com/sjamaan">
<img src="https://avatars.githubusercontent.com/u/128536?v=4" width="80;" alt="sjamaan"/>
@ -759,7 +787,8 @@ _Awesome-Privacy originated from [Personal-Security-Checklist](https://github.co
<br />
<sub><b>Silvhr</b></sub>
</a>
</td>
</td></tr>
<tr>
<td align="center">
<a href="https://github.com/spikecodes">
<img src="https://avatars.githubusercontent.com/u/19519553?v=4" width="80;" alt="spikecodes"/>
@ -773,8 +802,7 @@ _Awesome-Privacy originated from [Personal-Security-Checklist](https://github.co
<br />
<sub><b>Thomas Rettig</b></sub>
</a>
</td></tr>
<tr>
</td>
<td align="center">
<a href="https://github.com/tim-v3">
<img src="https://avatars.githubusercontent.com/u/103248132?v=4" width="80;" alt="tim-v3"/>
@ -802,7 +830,8 @@ _Awesome-Privacy originated from [Personal-Security-Checklist](https://github.co
<br />
<sub><b>Eric Lesiuta</b></sub>
</a>
</td>
</td></tr>
<tr>
<td align="center">
<a href="https://github.com/fireneat">
<img src="https://avatars.githubusercontent.com/u/95147296?v=4" width="80;" alt="fireneat"/>
@ -816,8 +845,7 @@ _Awesome-Privacy originated from [Personal-Security-Checklist](https://github.co
<br />
<sub><b>Ignoramous</b></sub>
</a>
</td></tr>
<tr>
</td>
<td align="center">
<a href="https://github.com/kevodwyer">
<img src="https://avatars.githubusercontent.com/u/5311499?v=4" width="80;" alt="kevodwyer"/>
@ -845,7 +873,8 @@ _Awesome-Privacy originated from [Personal-Security-Checklist](https://github.co
<br />
<sub><b>Pabloscloud</b></sub>
</a>
</td>
</td></tr>
<tr>
<td align="center">
<a href="https://github.com/partoneoftwo">
<img src="https://avatars.githubusercontent.com/u/1677630?v=4" width="80;" alt="partoneoftwo"/>
@ -859,8 +888,7 @@ _Awesome-Privacy originated from [Personal-Security-Checklist](https://github.co
<br />
<sub><b>Pipboy96</b></sub>
</a>
</td></tr>
<tr>
</td>
<td align="center">
<a href="https://github.com/theblackmallard">
<img src="https://avatars.githubusercontent.com/u/42389961?v=4" width="80;" alt="theblackmallard"/>

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 4.4 MiB

After

Width:  |  Height:  |  Size: 4.6 MiB

Binary file not shown.

View file

@ -235,8 +235,8 @@ Without using a secure app for instant messaging, all your conversations, meta d
| --- | --- |
**[Signal](https://signal.org/)** | Probably one of the most popular, secure private messaging apps that combines strong encryption (see [Signal Protocol](https://en.wikipedia.org/wiki/Signal_Protocol)) with a simple UI and plenty of features. It's widely used across the world, and easy-to-use, functioning similar to WhatsApp - with instant messaging, read-receipts, support for media attachments and allows for high-quality voice and video calls. It's cross-platform, open-source and totally free. Signal is [recommended](https://twitter.com/Snowden/status/661313394906161152) by Edward Snowden, and is a perfect solution for most users
**[Session](https://getsession.org)** | Session is a fork of Signal, however unlike Signal it does not require a mobile number (or any other personal data) to register, instead each user is identified by a public key. It is also decentralized, with servers being run by the community though [Loki Net](https://loki.network), messages are encrypted and routed through several of these nodes. All communications are E2E encrypted, and there is no meta data.
**[Silence](https://silence.im/)** | If you're restricted to only sending SMS/MMS, then Silence makes it easy to encrypt messages between 2 devices. This is important since traditional text messaging is inherently insecure. It's easy-to-use, reliable and secure - but has fallen in popularity, now that internet-based messaging is often faster and more flexible
**[XMPP](https://xmpp.org/)** | XMPP, also known as Jabber, is an open standard for decentralized messaging that has been widely used for decades. It has actually been the basis upon which WhatsApp, Facebook's Chat and Google's Talk were built, but these companies (eventually) chose to remove the interoperability with other servers. Prominent XMPP clients support [OMEMO end-to-end encryption](https://en.wikipedia.org/wiki/OMEMO), which is based on the [Double Ratchet Algorithm](https://en.wikipedia.org/wiki/Double_Ratchet_Algorithm) that is used in Signal. For more hands-on information and to register an account you can visit [JoinJabber](https://joinjabber.org). Below you can find a list of OMEMO-enabled clients for all the major platforms.<br><br><table><thead><tr><th>Program</th><th>Linux</th><th>MacOS</th><th>Windows</th><th>Android</th><th>iOS</th></tr></thead><tbody><tr><td><a href="https://gajim.org">Gajim</a> (<a href="https://gajim.org/download/#install-instructions">OMEMO plugin</a>)</td><td></td><td><a href="https://dev.gajim.org/gajim/gajim/-/wikis/help/Gajim-on-macOS">~</a></td><td></td><td></td><td></td></tr><tr><td><a href="https://dino.im">Dino</a></td><td></td><td></td><td><a href="https://github.com/LAGonauta/dino/releases"></a></td><td></td><td></td></tr><tr><td><a href="https://conversations.im">Conversations</a> / <a href="https://blabber.im">Blabber</a></td><td></td><td></td><td></td><td></td><td></td></tr><tr><td><a href="https://monal-im.org">Monal IM</a></td><td></td><td></td><td></td><td></td><td></td></tr><tr><td><a href="https://beagle.im">Beagle IM</a> / <a href="https://siskin.im">Siskin IM</a></td><td></td><td></td><td></td><td></td><td></td></tr></tbody></table>
**[Matrix](https://matrix.org)** | Matrix is a decentralized open network for secure communications, with E2E encryption with Olm and Megolm. Along with the [Element](https://element.io/) client, it supports VOIP + video calling and IM + group chats. Since Matrix has an open specification and Simple pragmatic RESTful HTTP/JSON API it makes it easy to integrates with existing 3rd party IDs to authenticate and discover users, as well as to build apps on top of it.
#### Other Notable Mentions
Other private, encrypted and open source messaging apps include: [Surespot](https://www.surespot.me), [Chat Secure](https://chatsecure.org/) (iOS only) and [Status](https://status.im/). Note that [Tor Messenger](https://blog.torproject.org/category/tags/tor-messenger)s been removed from the list, since development has halted.
@ -256,7 +256,6 @@ With [Peer-to-Peer](https://en.wikipedia.org/wiki/Peer-to-peer) networks, there
| Provider | Description |
| --- | --- |
**[Matrix](https://matrix.org)** + **[Element](https://element.io/)** client | Matrix is a decentralized open network for secure communications, with E2E encryption with Olm and Megolm. Along with the Element client, it supports VOIP + video calling and IM + group chats. Since Matrix has an open specification and Simple pragmatic RESTful HTTP/JSON API it makes it easy to integrates with existing 3rd party IDs to authenticate and discover users, as well as to build apps on top of it.
**[Session](https://getsession.org)** + **[LokiNet](https://loki.network)** client | Loki is an open source set of tools that allow users to transact and communicate anonymously and privately, through a decentralised, encrypted, onion-based network. Session is a desktop and mobile app that uses these private routing protocols to secure messages, media and metadata.
**[Briar](https://briarproject.org)** | Tor-based Android app for P2P encrypted messaging and forums. Where content is stored securely on your device (not in the cloud). It also allows you to connect directly with nearby contacts, without internet access (using Bluetooth or WiFi).
**[Ricochet Refresh](https://www.ricochetrefresh.net)** | Desktop instant messenger, that uses the Tor network to rendezvous with your contacts without revealing your identity, location/ IP or meta data. There are no servers to monitor, censor, or hack so Ricochet is secure, automatic and easy to use.
@ -334,8 +333,7 @@ Alternatively you could host your own catch-all email service. [Mailu](https://g
| Provider | Description |
| --- | --- |
**[Enigmail](https://www.enigmail.net)** | Mail client add-on, enabling the use of OpenPGP to easily encrypt, decrypt, verify and sign emails. Free and open source, Enifmail is compatible with Mozilla Thunderbird, Interlink Mail & News and Postbox. Their website contains thorough documentation and quick-start guides, once set up it is extremely convenient to use
**[TorBirdy](https://trac.torproject.org/projects/tor/wiki/torbirdy)** | Thunderbird extension, that configures it to make connections over the Tor network, in order to provide an additional layer of anonymity and security
**[Enigmail](https://www.enigmail.net)** | Mail client add-on, enabling the use of OpenPGP to easily encrypt, decrypt, verify and sign emails. Free and open source, Enigmail is compatible with Interlink Mail & News and Postbox. Their website contains thorough documentation and quick-start guides, once set up it is extremely convenient to use.
**[Email Privacy Tester](https://www.emailprivacytester.com/)** | Quick tool, that enables you to test whether your mail client "reads" your emails before you've opened them, and also checks what analytics, read-receipts or other tracking data your mail client allows to be sent back to the sender. The system is open source ([on GitLab](https://gitlab.com/mikecardwell/ept3)), developed by [Mike Cardwell](https://www.grepular.com/) and trusted, but if you do not want to use your real email, creating a second account with the same provider, should yield identical results
**[DKIM Verifier](https://addons.thunderbird.net/en-US/thunderbird/addon/dkim-verifier/?collection_id=a5557f08-eafd-7a39-81c6-09127da790f7)** | Verifies DKIM signatures and shows the result in the e-mail header, in order to help spot spoofed emails (which do not come from the domain that they claim to)
@ -600,7 +598,6 @@ Without using a secure, privacy-centric DNS all your web requests can be seen in
| --- | --- |
**[CloudFlare](https://developers.cloudflare.com/1.1.1.1/setting-up-1.1.1.1)** | One of the most performant options, Cloudflare's DNS supports DoH and DoT, and has a Tor implementation, providing world-class protection. They have native cross-platform apps, for easy set-up.
**[AdGuard](https://adguard.com/en/adguard-dns/overview.html)** | Open-source DNS provider, specialising in the blocking of ads, trackers and malicious domains. They have been independently audited and do not keep logs
**[SecureDNS](https://securedns.eu)** | An open source DNS provider, with built-in ad block and additional privacy features. Supports DoH, DoT and DNSCrypt. It is not as performant as some of the bigger players, but still a good option in terms of security
**[NextDNS](https://nextdns.io/)** | An ad-blocking, privacy-protecting, censorship-bypassing DNS. Also comes with analytics, and the ability to shield kids from adult content
See also this [Full List of Public DoH Servers](https://github.com/curl/curl/wiki/DNS-over-HTTPS), you can then check the performance of your chosen server with [DNSPerf](https://www.dnsperf.com/). Awesome Self-Hosted also has a [good list](https://awesome.tilde.fun/d/23-list-of-dns-servers