From a6d7490e3be8488510ee67366b0487ba01f58405 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linus=20F=C3=A4rnstrand?= <linus@mullvad.net>
Date: Thu, 23 May 2024 10:08:41 +0200
Subject: [PATCH 1/2] Enable quantum-resistant tunnels by default on macOS

Was already enabled by default on Linux, now we roll it out for macOS
also
---
 mullvad-types/src/wireguard.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mullvad-types/src/wireguard.rs b/mullvad-types/src/wireguard.rs
index 008b7a475c8d..1af50abadc4c 100644
--- a/mullvad-types/src/wireguard.rs
+++ b/mullvad-types/src/wireguard.rs
@@ -9,9 +9,9 @@ pub const MAX_ROTATION_INTERVAL: Duration = Duration::from_secs(30 * 24 * 60 * 6
 pub const DEFAULT_ROTATION_INTERVAL: Duration = MAX_ROTATION_INTERVAL;
 
 /// Whether to enable or disable quantum resistant tunnels when the setting is set to
-/// `QuantumResistantState::Auto`. It is currently enabled by default on Linux but disabled on all
-/// other platforms.
-const QUANTUM_RESISTANT_AUTO_STATE: bool = cfg!(target_os = "linux");
+/// `QuantumResistantState::Auto`. It is currently enabled by default on Linux and macOS,
+/// but disabled on all other platforms.
+const QUANTUM_RESISTANT_AUTO_STATE: bool = cfg!(any(target_os = "linux", target_os = "macos"));
 
 #[derive(Serialize, Deserialize, Copy, Clone, Debug, PartialEq, Eq)]
 #[serde(rename_all = "lowercase")]

From ca1facbca00cdce90ee46405e874c947e27418bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20L=C3=B6nnhager?= <david.l@mullvad.net>
Date: Thu, 25 Jul 2024 14:46:50 +0200
Subject: [PATCH 2/2] Update changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae7f5cd60b76..ce9e1b44226f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,10 @@ Line wrap the file at 100 chars.                                              Th
 ### Added
 - Add DAITA (Defence against AI-guided Traffic Analysis) setting for Linux and macOS.
 
+### Changed
+#### macOS
+- Enable quantum resistant tunnels by default (when set to `auto`).
+
 ### Fixed
 - Fix mullvad cli bug causing `mullvad status listen` command to miss events if they occurred
   too quickly.