Mullvad now accepts Monero (#1160)

Closes #1158

.github/workflows/mirror.yml

@@ -0,0 +1,31 @@
+name: 🪞 Push to Mirrors
+
+on: [ push, delete, create ]
+
+# Ensures that only one mirror task will run at a time.
+concurrency:
+  group: git-mirror
+
+jobs:
+  git-mirror:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Mirror to GitLab
+        uses: wearerequired/git-mirror-action@v1
+        env:
+          SSH_PRIVATE_KEY: ${{ secrets.ACTIONS_SSH_KEY }}
+        with:
+          source-repo: "git@github.com:privacyguides/privacyguides.org.git"
+          destination-repo: "git@gitlab.com:privacyguides/privacyguides.org.git"
+
+      - name: Cleanup
+        run: |
+          sudo rm -rf privacyguides.org.git
+
+      - name: Mirror to Codeberg
+        uses: wearerequired/git-mirror-action@v1
+        env:
+          SSH_PRIVATE_KEY: ${{ secrets.ACTIONS_SSH_KEY }}
+        with:
+          source-repo: "git@github.com:privacyguides/privacyguides.org.git"
+          destination-repo: "git@codeberg.org:privacyguides/privacyguides.org.git"

.github/workflows/preview.yml

@@ -3,6 +3,10 @@ name: 🔂 Surge PR Preview
 on:
   pull_request_target:
     types: [opened, synchronize, reopened]
+  
+# Ensures that only one mirror task will run at a time.
+concurrency:
+  group: surge-sh
 
 jobs:
   preview:

README.md

@@ -59,6 +59,13 @@ Our current list of team members can be found [here](https://github.com/orgs/pri
   - Browse our [open issues](https://github.com/privacyguides/privacyguides.org/issues) to see what needs to be updated
   - View some contribution tips on our [contributor's wiki](https://github.com/privacyguides/privacyguides.org/wiki)
 
+## Mirrors
+
+[![GitHub](https://img.shields.io/static/v1?logo=github&label=&message=GitHub&color=000&style=for-the-badge)](https://github.com/privacyguides/privacyguides.org)
+[![Gitea](https://img.shields.io/static/v1?logo=gitea&label=&message=Gitea&color=000&style=for-the-badge)](https://code.privacyguides.dev/privacyguides/privacyguides.org)
+[![GitLab](https://img.shields.io/static/v1?logo=gitlab&label=&message=GitLab&color=000&style=for-the-badge)](https://gitlab.com/privacyguides/privacyguides.org)
+[![Codeberg](https://img.shields.io/static/v1?logo=codeberg&label=&message=Codeberg&color=000&style=for-the-badge)](https://codeberg.org/privacyguides/privacyguides.org)
+
 ## Developing
 
 1. Clone this repository and submodules: `git clone --recurse-submodules https://github.com/privacyguides/privacyguides.org`

docs/about/privacy-policy.en.md

@@ -14,9 +14,11 @@ The privacy of our website visitors is important to us, so we do not track any i
 - No information is mined and harvested for personal and behavioral trends
 - No information is monetized
 
-We run a self-hosted version of [Plausible Analytics](https://plausible.io) to collect some anonymous usage data for statistical purposes. The goal is to track overall trends in our website traffic, it is not to track individual visitors. All the data is in aggregate only. No personal data is collected.
+You can view the data we collect at [stats.privacyguides.net/privacyguides.org](https://stats.privacyguides.net/privacyguides.org).
 
-Data collected includes referral sources, top pages, visit duration, information from the devices (device type, operating system, country and browser) used during the visit and more.
+We run a self-hosted installation of [Plausible Analytics](https://plausible.io) to collect some anonymous usage data for statistical purposes. The goal is to track overall trends in our website traffic, it is not to track individual visitors. All the data is in aggregate only. No personal data is collected.
+
+Data collected includes referral sources, top pages, visit duration, information from the devices (device type, operating system, country and browser) used during the visit and more. You can learn more about how Plausible works and collects information in a privacy-respecting manner [here](https://plausible.io/data-policy).
 
 ## Data We Collect From Account Holders
 

docs/email.en.md

@@ -1,9 +1,9 @@
 ---
-title: "Private Email Providers"
+title: "Email Services"
 icon: material/email
 ---
 
-Find a secure email provider that will keep your privacy in mind. Don’t settle for ad-supported platforms. Never trust any company with your privacy, always encrypt.
+Find a secure email service provider that will keep your privacy in mind. Don’t settle for ad-supported platforms. Never trust any company with your privacy, always encrypt.
 
 !!! warning
 
@@ -17,7 +17,7 @@ Find a secure email provider that will keep your privacy in mind. Don’t settle
 
     [Recommended Instant Messengers](real-time-communication.md){ .md-button }
 
-## Recommended Email Services
+## Recommended Email Providers
 
 ### ProtonMail
 
@@ -230,20 +230,82 @@ Tutanota is working on a [desktop client](https://tutanota.com/blog/posts/deskto
 
     StartMail allows for proxying of images within emails. If you allow the remote image to be loaded, the sender won't know what your IP address is.
 
-## Email Cloaking Services
+## Email Aliasing Services
+
+An email aliasing service allows you to easily generate a new email address for every website you register for. The email aliases you generate are then forwarded to an email address of your choosing, hiding both your "main" email address and the identity of your email provider. True email aliasing is better than the plus (+) "alias" trick commonly used and supported by many providers, which allows you to create aliases like yourname+[anythinghere]@example.com, because websites, advertisers, and tracking networks can trivially remove anything after the + sign to know your true email address.
+
+Using a dedicated email aliasing service also has a number of benefits over a catch-all alias on a custom domain:
+
+- Aliases can be turned on and off individually when you need them, preventing websites from emailing you randomly.
+- Replies are sent from the alias address, shielding your real email address.
+
+They also have a number of benefits over "temporary email" services:
+
+- Aliases are permanent, and can be turned on again if you need to receive something like a password reset.
+- Emails are sent to your trusted mailbox rather than stored by the alias provider.
+- Temporary email services typically have public mailboxes which can be accessed by anyone who knows the address, aliases are private to you.
+
+Our email aliasing recommendations are providers that allow you to create aliases on domains they own, as well as custom domains for a modest yearly fee. They can also be self-hosted on your custom domain if you want maximum control. However, using a custom domain can have privacy-related drawbacks: If you are the only user on your custom domain your actions can be easily tracked across websites simply by looking at the domain name in the email, ignoring everything before the at (@) sign.
+
+Using an aliasing service requires trusting both your email provider and your aliasing provider with your unencrypted messages. Some providers mitigate this slightly with automatic PGP encryption, which reduces the number of parties you need to trust from 2 to 1 by encrypting incoming emails before they are delivered to your final mailbox provider.
+
+### SimpleLogin
+
+!!! recommendation
+
+    ![Simplelogin logo](assets/img/email/simplelogin.svg){ align=right }
+
+    **[SimpleLogin](https://simplelogin.io)** (now owned by ProtonMail) is a free service which provides email aliases on a variety of shared domain names, and optionally provides features like unlimited aliases and custom domains for $30/year. [Source code on GitHub](https://github.com/simple-login/app).
+
+    [Website](https://simplelogin.io){ .md-button .md-button--primary } [Privacy Policy](https://simplelogin.io/privacy/){ .md-button }
+
+    ??? downloads
+        - [:fontawesome-brands-firefox: Firefox](https://addons.mozilla.org/en-US/firefox/addon/simplelogin/)
+        - [:fontawesome-brands-chrome: Chrome](https://chrome.google.com/webstore/detail/dphilobhebphkdjbpfohgikllaljmgbn)
+        - [:fontawesome-brands-edge: Edge](https://microsoftedge.microsoft.com/addons/detail/simpleloginreceive-sen/diacfpipniklenphgljfkmhinphjlfff)
+        - [:fontawesome-brands-safari: Safari](https://apps.apple.com/app/id1494051017)
+        - [:fontawesome-brands-app-store-ios: App Store](https://apps.apple.com/app/id1494359858)
+        - [:fontawesome-brands-google-play: Google Play](https://play.google.com/store/apps/details?id=io.simplelogin.android)
+        - [:pg-f-droid: F-Droid](https://f-droid.org/en/packages/io.simplelogin.android.fdroid/)
+        - [:fontawesome-brands-github: Source](https://github.com/simple-login)
+
+SimpleLogin [is owned by ProtonMail](https://protonmail.com/blog/proton-and-simplelogin-join-forces/) as of April 8, 2022. If you use ProtonMail for your primary mailbox, this makes SimpleLogin a great choice, because you now only have to trust a single email provider, and SimpleLogin will be more closely integrated with ProtonMail's offerings in the future. However, SimpleLogin continues to support forwarding to any provider, not ProtonMail exclusively.
+
+Free features:
+
+- [x] 15 Shared Aliases
+- [x] Unlimited Replies
+- [x] 1 Recepient Mailbox
+
+### AnonAddy
 
 !!! recommendation
 
     ![AnonAddy logo](assets/img/email/anonaddy.svg#only-light){ align=right }
     ![AnonAddy logo](assets/img/email/anonaddy-dark.svg#only-dark){ align=right }
 
-    **[AnonAddy](https://anonaddy.com)** lets you create aliases that forward to their email address. Can be self-hosted. [Source code on GitHub](https://github.com/anonaddy/anonaddy). 
+    **[AnonAddy](https://anonaddy.com)** lets you create 20 domain aliases on a shared domain for free, or unlimited "standard" aliases which are less anonymous. It has two premium plans at $12/year and $36/year which provide additional features. [Source code on GitHub](https://github.com/anonaddy/anonaddy).
 
-!!! recommendation
+    [Website](https://anonaddy.com){ .md-button .md-button--primary } [Privacy Policy](https://anonaddy.com/privacy/){ .md-button }
 
-    ![Simplelogin logo](assets/img/email/simplelogin.svg){ align=right }
+    ??? downloads
+        - [:fontawesome-brands-firefox: Firefox](https://addons.mozilla.org/en-GB/firefox/addon/anonaddy/)
+        - [:fontawesome-brands-chrome: Chrome](https://chrome.google.com/webstore/detail/anonaddy-anonymous-email/iadbdpnoknmbdeolbapdackdcogdmjpe)
+        - [:material-apple-ios: iOS](https://anonaddy.com/faq/#is-there-an-ios-app)
+        - [:fontawesome-brands-android: Android](https://anonaddy.com/faq/#is-there-an-android-app)
+        - [:fontawesome-brands-github: Source](https://github.com/anonaddy)
 
-    **[SimpleLogin](https://simplelogin.io)** allows you to easily create aliases for your email. Can be self-hosted. [Source code on GitHub](https://github.com/simple-login/app).
+AnonAddy differentiates between "shared aliases" and "standard aliases": The number of shared aliases (which end in a domain like @anonaddy.me which is shared by other users) you can create is limited to 20 on AnonAddy's free plan and 50 on their $12/month plan. You can create unlimited standard aliases (which end in a domain like @[username].anonaddy.com or a custom domain on paid plans), however as noted above this can be detrimental to privacy, because people can trivially tie your standard aliases together based on the domain name alone. Unlimited shared alias are available for $36/year.
+
+Free features:
+
+- [x] 20 Shared Aliases
+- [x] Unlimited Standard Aliases
+- [ ] No Outgoing Replies
+- [x] 2 Receipent Mailboxes
+- [x] Automatic PGP Encryption
+
+*[Automatic PGP Encryption]: Allows you to encrypt non-encrypted incoming emails before they are forwarded to your mailbox, making sure your primary mailbox provider never sees unencrypted email content.
 
 ## Self-Hosting Email
 

docs/index.en.md

@@ -38,7 +38,7 @@ It's important for a website like Privacy Guides to always stay up-to-date. We n
 <div class="grid cards" style="margin:auto;max-width:800px;text-align:center;" markdown>
 
 - [:fontawesome-brands-reddit: Join the r/PrivacyGuides Subreddit](https://www.reddit.com/r/privacyguides)
-- [:fontawesome-brands-mastodon: Follow us on Mastodon](https://mastodon.social/@privacyguides)
+- [:fontawesome-brands-mastodon: Follow us on Mastodon](https://mastodon.social/@privacyguides){ rel=me }
 - [:material-book-edit: Contribute to this website](https://github.com/privacyguides/privacyguides.org)
 - [:pg-matrix: Chat with us on Matrix](https://matrix.to/#/#privacyguides:matrix.org)
 

docs/self-contained-networks.en.md

@@ -48,9 +48,9 @@ If you are currently browsing clearnet and want to access the dark web, this sec
         - [:fontawesome-brands-freebsd: FreeBSD](https://www.freshports.org/security/i2p)
         - [:pg-openbsd: OpenBSD](https://openports.se/net/i2pd)
         - [:pg-netbsd: NetBSD](https://pkgsrc.se/wip/i2pd)
+        - [:fontawesome-brands-android: Android](https://geti2p.net/en/download#android)
         - [:fontawesome-brands-google-play: Google Play](https://play.google.com/store/apps/details?id=net.i2p.android)
         - [:pg-f-droid: F-Droid](https://f-droid.org/app/net.i2p.android.router)
-        - [:fontawesome-brands-android: Android](https://download.i2p2.de/android/current/)
         - [:fontawesome-brands-git: Source](https://geti2p.net/en/get-involved/guides/new-developers#getting-the-i2p-code)
 
 ### The Freenet Project

docs/vpn.en.md

@@ -62,9 +62,9 @@ Find a no-logging VPN operator who isn’t out to sell or read your web traffic.
 
     Mullvad provides the source code for their desktop and mobile clients in their [GitHub organization](https://github.com/mullvad/mullvadvpn-app).
 
-??? check "Accepts Cash"
+??? check "Accepts Cash and Monero"
 
-    Mullvad, in addition to accepting credit/debit cards and PayPal, accepts Bitcoin, Bitcoin Cash, and **cash/local currency** as anonymous forms of payment. They also accept Swish and bank wire transfers.
+    Mullvad, in addition to accepting credit/debit cards and PayPal, accepts Bitcoin, Bitcoin Cash, **Monero** and **cash/local currency** as anonymous forms of payment. They also accept Swish and bank wire transfers.
 
 ??? check "WireGuard Support"
 

mkdocs.yml

@@ -112,6 +112,8 @@ markdown_extensions:
   - pymdownx.mark
   - pymdownx.tilde
   - pymdownx.snippets
+  - pymdownx.tasklist:
+      custom_checkbox: true
   - attr_list
   - def_list
   - md_in_html
@@ -182,6 +184,7 @@ nav:
     - 'about.md'
     - 'Online Services': 'https://privacyguides.net'
     - 'about/donate.md'
+    - 'Website Statistics': 'https://stats.privacyguides.net/privacyguides.org'
     - 'about/notices.md'
     - 'about/privacy-policy.md'
   - 'Donate': '/about/donate/'