From 2a96893acaa6fa73a30e05cf3579634df8872cbc Mon Sep 17 00:00:00 2001
From: nitrohorse <1514352+nitrohorse@users.noreply.github.com>
Date: Sat, 3 Aug 2019 15:48:42 -0700
Subject: [PATCH] Cleanup merge conflicts and update package script
---
_includes/sections/email-providers.html | 336 +++++++-------
_includes/sections/instant-messenger.html | 28 +-
_includes/sections/operating-systems.html | 12 +-
_includes/sections/vpn.html | 536 +++++++++++-----------
package.json | 2 +-
5 files changed, 457 insertions(+), 457 deletions(-)
diff --git a/_includes/sections/email-providers.html b/_includes/sections/email-providers.html
index b49cbd0f..6130f9a7 100644
--- a/_includes/sections/email-providers.html
+++ b/_includes/sections/email-providers.html
@@ -5,188 +5,188 @@
Interesting Email Providers Under Development
diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html
index eb09fab1..b4a768dd 100644
--- a/_includes/sections/instant-messenger.html
+++ b/_includes/sections/instant-messenger.html
@@ -1,7 +1,7 @@
Encrypted Instant Messenger
-
If you are currently using an Instant Messenger like LINE, Telegram, Viber, WhatsApp, or plain SMS messages you should pick an alternative here.
+
If you are currently using an Instant Messenger like LINE, Telegram, Viber, WhatsApp, or plain SMS messages you should pick an alternative here.
Worth Mentioning
- - Briar - An ultra-secure peer-to-peer instant messenger that connects to contacts via Direct Wi-Fi, Bluetooth, or Tor over the internet, keeping its users protected from surveillance and censorship.
-
- RetroShare - An E2E encrypted instant messaging and voice/video call client. RetroShare supports both TOR and I2P.
- - XMPP - Federated instant messaging protocol with OMEMO, OTR, or OpenPGP end-to-end encryption:
-
- - Conversations (Android) - An open source Jabber/XMPP client for Android 4.4+ smartphones. OMEMO
- - Gajim (FreeBSD, Linux, Windows) - An open source fully featured XMPP client. OMEMO
- - Monal (iOS, MacOS) - An XMPP client in active development. OMEMO
- - Other OMEMO ready clients.
-
- - Kontalk - A community-driven instant messaging network. Supports end-to-end encryption. Both client-to-server and server-to-server channels are fully encrypted.
- - Keybase - Warning End-to-end encrypted messaging with social verification.
- - Status - Experimental A free and open-source, peer-to-peer, encrypted instant messanger with support for DAPPs.
- - Ricochet - Danger Experimental Ricochet uses the Tor network 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.
+ - Briar - An ultra-secure peer-to-peer instant messenger that connects to contacts via Direct Wi-Fi, Bluetooth, or Tor over the internet, keeping its users protected from surveillance and censorship.
+
- RetroShare - An E2E encrypted instant messaging and voice/video call client. RetroShare supports both TOR and I2P.
+ - XMPP - Federated instant messaging protocol with OMEMO, OTR, or OpenPGP end-to-end encryption:
+
+ - Conversations (Android) - An open source Jabber/XMPP client for Android 4.4+ smartphones. OMEMO
+ - Gajim (FreeBSD, Linux, Windows) - An open source fully featured XMPP client. OMEMO
+ - Monal (iOS, MacOS) - An XMPP client in active development. OMEMO
+ - Other OMEMO ready clients.
+
+ - Kontalk - A community-driven instant messaging network. Supports end-to-end encryption. Both client-to-server and server-to-server channels are fully encrypted.
+ - Keybase - Warning End-to-end encrypted messaging with social verification.
+ - Status - Experimental A free and open-source, peer-to-peer, encrypted instant messanger with support for DAPPs.
+ - Ricochet - Danger Experimental Ricochet uses the Tor network 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.
diff --git a/_includes/sections/operating-systems.html b/_includes/sections/operating-systems.html
index 3699f3c7..91c26ac9 100644
--- a/_includes/sections/operating-systems.html
+++ b/_includes/sections/operating-systems.html
@@ -41,9 +41,9 @@
Worth Mentioning
- - OpenBSD - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.
- - Arch Linux - A simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement. Parabola is a
- completely open source version of Arch Linux.
- - Whonix contrib - A Debian GNU/Linux based security-focused Linux distribution. It aims to provide privacy, security and anonymity on the internet. The operating system consists of two virtual machines, a "Workstation"
- and a Tor "Gateway". All communication are forced through the Tor network to accomplish this.
-
+ OpenBSD - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.
+ Arch Linux - A simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement. Parabola is a
+ completely open source version of Arch Linux.
+ Whonix contrib - A Debian GNU/Linux based security-focused Linux distribution. It aims to provide privacy, security and anonymity on the internet. The operating system consists of two virtual machines, a "Workstation"
+ and a Tor "Gateway". All communication are forced through the Tor network to accomplish this.
+
\ No newline at end of file
diff --git a/_includes/sections/vpn.html b/_includes/sections/vpn.html
index e4f62ce5..96f59744 100644
--- a/_includes/sections/vpn.html
+++ b/_includes/sections/vpn.html
@@ -6,288 +6,288 @@
{% assign eur_to_usd = 1.14 %}
- 
- 
- 
- 
- 
- 
+ 
- 
+ 
- 
- 
- 
