From ab4ea72ce722591402ae65a0dbba6d73c3476d63 Mon Sep 17 00:00:00 2001 From: Jonah Date: Tue, 29 Oct 2019 22:29:15 -0500 Subject: [PATCH 1/7] Update CONTRIBUTING.md --- .github/CONTRIBUTING.md | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 2e659087..5e951709 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,6 +1,22 @@ # Contributing Guidelines -Please read this before contributing. +Please read this document in full before contributing. + +- [Rules](#rules) +- [Quality over Quantity](#quality-over-quantity) +- [Software Criteria](#software-criteria) + - [Main (All Software)](#main) + - [Providers](#providers) + - [DNS](#dns) + - [VPN](#vpn) + - [Email](#email) + - [Hardware](#hardware) + - [Software](#software) + - [Encryption](#encryption) + - [Operating Systems](#operating-systems) +- [Images](#images) +- [Licensing](#licensing) +- [Contributing via email](#contributing-via-email) ## Rules @@ -16,7 +32,9 @@ Please read this before contributing. We're trying to keep it simple and promote the best tools, not all of them. ## Software Criteria + ### Main + - Easy to use. Could your mother use that tool or service? Usability is most important. - Cross-platform / Accessible. - Privacy respecting. @@ -26,7 +44,9 @@ We're trying to keep it simple and promote the best tools, not all of them. There can be exceptions if no software is available that meet the criteria. Note: This criteria applies to all of privacytools.io + ### Providers + - Prioritize Products by privacy respecting nationality. ### DNS @@ -37,7 +57,9 @@ Note: This criteria applies to all of privacytools.io - Preferably supports QNAME minimization (if you have access to the dig command, `dig +short txt qnamemintest.internet.nl` or `Resolve-DnsName -Type TXT -Name qnamemintest.internet.nl` if you are on Windows 10) ### VPN + See https://www.privacytools.io/providers/vpn/#criteria for more details. + - Prioritize Products by privacy respecting nationality. - Cannot be based in USA or UK. - Must be accessible via Open Source Software (e.g. OpenVPN, WireGuard) @@ -46,23 +68,28 @@ See https://www.privacytools.io/providers/vpn/#criteria for more details. - No logging policy ### Email + - Outside of USA - Support SMTP SSL - Accessible Using Open Source Software (e.g. allows IMAP) ### Hardware + - Must be [H-Node Class A](https://h-node.org/wiki/page/en/compatibility-classes) or equivalent (if applicable) - Must prioritize hardware certifications like [RYF](https://ryf.fsf.org/), [OSHWA](https://certification.oshwa.org/), and OSI when available. - Cannot lock users to a particular platform. ### Software + - Must be able to download over encrypted network (can be a mirror) - Must be Open Source Software ### Encryption + - Only verifiable encryption is to be trusted -### OSes +### Operating Systems + - Must state if recommends, depends on, or offers non-free software (contrib) - No Tracking Policy (opt-in analytics is ok) @@ -74,3 +101,13 @@ See https://www.privacytools.io/providers/vpn/#criteria for more details. ## Licensing The content and original technology of this website is made available under the Creative Commons Zero v1.0 Universal license text. Some files or folders may include works from other projects with separate licenses, and will be marked as such. **By contributing to this repository, contributors do not necessarily agree to sign a CLA or legally transfer their copyright to the project, but they do at a minimum agree to license their work under the current license of this repository: In this case, the Creative Commons Zero v1.0 Universal.** + +## Contributing via email + +If you have a GitHub account, or are able to create a GitHub account, we ask that you do not submit issues via email. + +If you do not have a GitHub account, you may submit software recommendations or other issues via email without creating a GitHub account by emailing `privacytools@fire.fundersclub.com`. The subject line of your email will become the issue title. Your name will be included in the posted issue. + +This repository uses [@fire-bot](https://github.com/fire-bot), [a service](https://fire.fundersclub.com) from FundersClub that converts incoming emails to GitHub issues. By sending a message to the email address above, you will be sharing your email address and message content with FundersClub. FundersClub has a privacy policy at [https://fundersclub.com/catalyst-privacy-policy/](https://fundersclub.com/catalyst-privacy-policy/) you should review before using this service. Any attachments you send via this service may be stored indefinitely by FundersClub for the purpose of making them available within the submitted GitHub issue. + +You can view an example of the created issues' format at [#1444](https://github.com/privacytoolsIO/privacytools.io/issues/1444). -- 2.47.2 From 07b712083ca912c5e550052c17cfb399ede5801b Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Wed, 30 Oct 2019 14:20:52 +0200 Subject: [PATCH 2/7] operating-systems: add link to cyberciti on microcode updates (#1411) Co-Authored-By: Jonah Aragon --- _includes/sections/operating-systems.html | 1 + 1 file changed, 1 insertion(+) diff --git a/_includes/sections/operating-systems.html b/_includes/sections/operating-systems.html index 37333029..c6eae044 100644 --- a/_includes/sections/operating-systems.html +++ b/_includes/sections/operating-systems.html @@ -75,6 +75,7 @@ gitlab="https://salsa.debian.org/qa/debsources"
  • CPU.fail
  • Hardware vulnerabilities index on The Linux kernel user's and administrator's guide
    • +
  • How to install/update CPU microcode firmware on Linux - Regardless of your CPU manufacturer, you should always install the latest microcode packages available to be protected from CPU vulnerabilities, especially if the command above reports no microcode in its output.
  • MDS - Microarchitectural Data Sampling on The Linux kernel user's and administrator's guide
  • RIDL and Fallout: MDS attacks on mdsattacks.com
  • Simultaneous multithreading on Wikipedia
    • -- 2.47.2 From e27d70387fb892abe6ed3e60f395e45ecb0749d1 Mon Sep 17 00:00:00 2001 From: Jonah Date: Wed, 30 Oct 2019 14:27:50 -0500 Subject: [PATCH 3/7] Update broken links --- .github/CONTRIBUTING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 5e951709..03d8b62f 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -25,7 +25,7 @@ Please read this document in full before contributing. - Be constructive. - Please feel free to *review changes* in the *files changed* tab of any pull request at any time. -- See also our [Code of Conduct](https://github.com/privacytoolsIO/privacytools.io/blob/master/CODE_OF_CONDUCT.md) +- See also our [Code of Conduct](https://github.com/privacytoolsIO/.github/blob/master/CODE_OF_CONDUCT.md) ## Quality over Quantity @@ -95,8 +95,8 @@ See https://www.privacytools.io/providers/vpn/#criteria for more details. ## Images -- Provider logos are 200px x 70px ([example](https://www.privacytools.io/assets/img/provider/AirVPN.png)) -- Tool logos are 120px x 120px ([example](https://www.privacytools.io/assets/img/tools/ChatSecure.png)) +- Provider logos are 200px x 70px ([example](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/img/provider/Mullvad.png)) +- Tool logos are 120px x 120px ([example](https://github.com/privacytoolsIO/privacytools.io/blob/master/assets/img/tools/Firefox.png)) ## Licensing -- 2.47.2 From 7c1e595c7a9864f80aed45f4978eb27104ef5585 Mon Sep 17 00:00:00 2001 From: djoate <56777051+djoate@users.noreply.github.com> Date: Wed, 30 Oct 2019 21:41:10 +0000 Subject: [PATCH 4/7] Update EteSync pricing and VPN server data (#1438) * vpn.html: update data Sources: https://www.ivpn.net/facts https://protonvpn.com/secure-vpn https://mullvad.net/en/servers/ * calendar-contacts-sync.html: bump price, fix typo - According to https://www.etesync.com/accounts/signup/#plan, it starts being billed yearly at $2 per month, so $24 per year. - Fix missing slash and serial comma * mullvad: 406 servers to 409 servers https://mullvad.net/en/servers/ --- _includes/sections/calendar-contacts-sync.html | 4 ++-- _includes/sections/vpn.html | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/_includes/sections/calendar-contacts-sync.html b/_includes/sections/calendar-contacts-sync.html index ddfd63cc..40f966ac 100644 --- a/_includes/sections/calendar-contacts-sync.html +++ b/_includes/sections/calendar-contacts-sync.html @@ -26,7 +26,7 @@ include cardv2.html title="Email Providers" image="/assets/img/misc/email.png" - description='Many email providers also offer calendar and or contacts sync services. Refer to the Email Providers section to choose an email provider and check if they also offer calendar and or contacts sync.' + description='Many email providers also offer calendar and or contacts sync services. Refer to the Email Providers section to choose an email provider and check if they also offer calendar and/or contacts sync.' website="/providers/email" %} @@ -34,7 +34,7 @@ include cardv2.html title="EteSync" image="/assets/img/provider/etesync.png" - description="EteSync is a secure, end-to-end encrypted and journaled personal information (e.g. contacts and calendar) cloud synchronization and backup for Android and any OS that supports CalDAV/CardDAV. It costs $14 per year to use, or you can host the server yourself for free." + description="EteSync is a secure, end-to-end encrypted, and journaled personal information (e.g. contacts and calendar) cloud synchronization and backup for Android and any OS that supports CalDAV/CardDAV. It costs $24 per year to use, or you can host the server yourself for free." website="https://www.etesync.com/" forum="https://forum.privacytools.io/t/discussion-etesync-calender-contacts-sync-tools/1536" github="https://github.com/etesync" diff --git a/_includes/sections/vpn.html b/_includes/sections/vpn.html index d2f07e2b..81a9b996 100644 --- a/_includes/sections/vpn.html +++ b/_includes/sections/vpn.html @@ -13,8 +13,8 @@

    Mullvad EUR €60/Year

    Mullvad is a fast and inexpensive VPN with a serious focus on transparency and security. They have been in operation since 2009. It is the only VPN provider that currently meets our criteria for recommendation. Mullvad is based in Sweden and does not have a free trial. Visit mullvad.net to create an account.

    -
    409+ Servers
    -

    Mullvad has 409 servers in 38 countries at the time of writing this page. Typically the more servers a provider offers, the better: With hundreds of servers in operation, you are far more likely to find a fast connection and a server geographically closest to you.

    +
    406+ Servers
    +

    Mullvad has 409 servers in 39 countries at the time of writing this page. Typically the more servers a provider offers, the better: With hundreds of servers in operation, you are far more likely to find a fast connection and a server geographically closest to you.

    WireGuard Support

    In addition to standard OpenVPN connections, Mullvad supports WireGuard. WireGuard is an experimental protocol with theoretically better security and higher reliability, although it is not currently recommended for production use.

    Independently Audited
    @@ -55,8 +55,8 @@
    Marc Loebekken, ProtonVPN AG Legal counsel

    We will reevaluate this listing at the end of 2019 or when the aforementioned report has been published, whichever is sooner. -

    442+ Servers
    -

    ProtonVPN has 442 servers in 33 countries at the time of writing this page. Typically the more servers a provider offers, the better: With hundreds of servers in operation, you are far more likely to find a fast connection and a server geographically closest to you.

    +
    526+ Servers
    +

    ProtonVPN has 526 servers in 42 countries at the time of writing this page. Typically the more servers a provider offers, the better: With hundreds of servers in operation, you are far more likely to find a fast connection and a server geographically closest to you.

    Accepts Bitcoin

    ProtonVPN does technically accept Bitcoin payments; however, you either need to have an existing account, or contact their support team in advance to register with Bitcoin.

    Mobile Clients
    @@ -76,8 +76,8 @@
    No Security Audit

    IVPN has undergone a no-logging audit from Cure53 which concluded in agreement with IVPN's no-logging claim. However, IVPN has not undergone a more comprehensive security audit by an independent third party, and therefore cannot be strongly recommended at this time. We have still chosen to list it on this page with the assumption that an audit will be published soon: The IVPN team reportedly plans to begin the process in September.

    We will reevaluate this listing at the end of 2019 or when the aforementioned report has been published, whichever is sooner. -

    70+ Servers
    -

    IVPN has 70 servers in 29 countries at the time of writing this page. Typically the more servers a provider offers, the better. IVPN has a decent (but not exceptional) server count that will most likely provide adequate coverage to most users.

    +
    77+ Servers
    +

    IVPN has 77 servers in 31 countries at the time of writing this page. Typically the more servers a provider offers, the better. IVPN has a decent (but not exceptional) server count that will most likely provide adequate coverage to most users.

    Accepts Bitcoin

    In addition to accepting credit/debit cards and PayPal, IVPN accepts Bitcoin and cash/local currency (on annual plans) as anonymous forms of payment.

    Mobile Clients
    -- 2.47.2 From dfbfc31362fe6417f9a793000097222a4b1f44d3 Mon Sep 17 00:00:00 2001 From: Jonah Date: Thu, 31 Oct 2019 18:49:19 -0500 Subject: [PATCH 5/7] OpenCollective Information Closes #899. --- _includes/sections/header.html | 4 ++++ pages/donate.html | 20 +++++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/_includes/sections/header.html b/_includes/sections/header.html index 44dffd87..bdcef64c 100644 --- a/_includes/sections/header.html +++ b/_includes/sections/header.html @@ -1,3 +1,7 @@ + +

    privacytools.io

    You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities. privacytools.io provides services, tools and knowledge to protect your privacy against global mass surveillance.

    diff --git a/pages/donate.html b/pages/donate.html index a7a2c46a..00c021a5 100644 --- a/pages/donate.html +++ b/pages/donate.html @@ -9,14 +9,20 @@ permalink: /donate/
    privacytools.io
    -

    Please Donate

    -

    Our website is free of advertisements and not affiliated with any listed providers.
    Your donation will cover our costs for servers, domains, coffee, beer, and pizza.

    -

    - Liberapay - Patreon - PayPal -

    +
    +
    Donate via OpenCollective
    +
    +

    If you are able, please consider contributing to our development and outreach programs. Contributions via OpenCollective to privacytools.io are tax deductible for US taxpayers. These funds are transparently and primarily used to cover server costs.

    + Contribute + More Info +
    +
    + +

    Please Donate

    + +

    Our website is free of advertisements and not affiliated with any listed providers.
    Your donation will cover our costs for servers, domains, coffee, beer, and pizza.

    +

    You may also contribute via the cryptocurrencies below, however we will not be able to provide a receipt for your contribution.
    Your contribution will be considered an anonymous, unrestricted contribution and paid to our Fiscal Host at OpenCollective when we convert to currency.

    -- 2.47.2 From a83b303408e6ca539c88a7bed0cd68d6b23bf5b8 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Fri, 1 Nov 2019 22:11:27 -0500 Subject: [PATCH 6/7] privacytools.io sponsorships (#1451) * Add sponsorship sections and information * Correct typographical error * Minor adjustments --- _includes/footer.html | 4 ++-- _includes/nav.html | 4 ++-- index.html | 5 +++++ pages/sponsors.html | 49 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 58 insertions(+), 4 deletions(-) create mode 100644 pages/sponsors.html diff --git a/_includes/footer.html b/_includes/footer.html index 5c7cfa7b..beebe2f6 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -61,8 +61,8 @@
    - - Donate + + Support Us!
    diff --git a/_includes/nav.html b/_includes/nav.html index c59cecfd..81fb1edf 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -142,8 +142,8 @@ Blog - - Donate + + Sponsors Theme diff --git a/index.html b/index.html index 87ada20d..f72aa4d9 100644 --- a/index.html +++ b/index.html @@ -5,6 +5,11 @@ layout: default {% include sections/header.html %} {% include sections/resources.html %} +

    Sponsors

    + + {% include sections/quotes.html %} {% include sections/privacy-resources.html %} {% include sections/participate.html %} diff --git a/pages/sponsors.html b/pages/sponsors.html new file mode 100644 index 00000000..c4c1b31c --- /dev/null +++ b/pages/sponsors.html @@ -0,0 +1,49 @@ +--- +layout: default +active_page: sponsors +permalink: /sponsors/ +--- + +
    +
    +
    +
    +

    Sponsors of privacytools.io

    +
    +
    +

    The privacytools.io website and services are a community project. There is no advertising, affiliate links, or other forms of monetization.
    Your donations here directly support hosting this website and compensating contributors to this project.

    +

    + Become a Sponsor + Donate Directly +

    +
    +
    +
    +

    Why sponsor privacytools.io?

    +

    This sponsorship program is designed to allow companies, organizations, and individuals partner with the privacytools.io team to support our vision of a more privacy-respecting internet and the greater online community.

    +

    With this exposure and sponsorship, your customers will recognize your intrinsic understanding and commitment to user privacy. Moreover, you'll directly contribute to our mission of spreading privacy-respecting tools and knowledge worldwide!

    +

    As a sponsor of privacytools.io, your company will be widely recognized in a variety of ways, some of which we've detailed below.

    +
    General Information
    +

    This website receives well over 250,000 pageviews on a monthly basis and is highly ranked for privacy-related keywords. In addition to the benefits below your contribution will be featured on our OpenCollective page and we will thank you via social media for your contribution.

    +
    🥉 Bronze Sponsorship
    +
      +
    • Your name and link along with a small logo or avatar on the sponsors page of this website.
      • +
    +
    🥈 Silver Sponsorship
    +
      +
    • Your medium-sized logo as a link at the top of our sponsors page.
      • +
    +
    🥇 Gold Sponsorship
    +
      +
    • Your medium-sized logo as a link on the privacytools.io homepage and at the very top of our sponsors page.
      • +
    +
    We will not provide...
    +

    We pride ourselves on our integrity and commitment to spreading unbiased and fact-based information regarding privacy and privacy-respecting tools. All tools we recommend throughout our website are subject to strict criteria as judged by our team and the community across our various platforms. Your sponsorship will not grant your organization any special consideration when choosing our recommendations throughout the website, a process which we make clear via our transparent ledger on OpenCollective and our public discussions on GitHub. Your sponsorship benefits are limited to those outlined above.

    +
    Tax and Financial Information
    +

    Your contribution to privacytools.io will be handled by the Open Collective Foundation 501(c)(3). For US companies and taxpayers, this means your contribution is tax deductible. As a non-profit, your sponsorship contribution will not be used for private profit and will only be used to cover expenses incurred by the project. All of our transactions (donations and expenses) are published transparently on OpenCollective. For the benefit of our readership, anonymous contributions will not be eligible for the sponsorship opportunities outlined above.

    +
    More Information
    +

    If you are interested and have further questions, you are welcome to reach out to us directly at sponsors@privacytools.io.

    +
    + Become a Sponsor +
    +
    -- 2.47.2 From 56cd51bd5aa1be5feaf2f383e6cb9a6320c8ed18 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Fri, 1 Nov 2019 22:23:38 -0500 Subject: [PATCH 7/7] Update sponsors.html --- pages/sponsors.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/sponsors.html b/pages/sponsors.html index c4c1b31c..df99c9f7 100644 --- a/pages/sponsors.html +++ b/pages/sponsors.html @@ -25,15 +25,15 @@ permalink: /sponsors/

    As a sponsor of privacytools.io, your company will be widely recognized in a variety of ways, some of which we've detailed below.

    General Information

    This website receives well over 250,000 pageviews on a monthly basis and is highly ranked for privacy-related keywords. In addition to the benefits below your contribution will be featured on our OpenCollective page and we will thank you via social media for your contribution.

    -
    🥉 Bronze Sponsorship
    +
    🥉 Bronze Sponsorship - Info
    • Your name and link along with a small logo or avatar on the sponsors page of this website.
    -
    🥈 Silver Sponsorship
    +
    🥈 Silver Sponsorship - Info
    • Your medium-sized logo as a link at the top of our sponsors page.
    -
    🥇 Gold Sponsorship
    +
    🥇 Gold Sponsorship - Info
    • Your medium-sized logo as a link on the privacytools.io homepage and at the very top of our sponsors page.
    -- 2.47.2