Merge branch 'change-multihop-default'

3 files changed, 9 insertions, 6 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d18ade54e..125cd3bab5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,9 +27,6 @@ Line wrap the file at 100 chars.                                              Th
 - Add obfuscation settings under "WireGuard settings".
 
 #### Windows
-- Windows daemon now looks up the MTU on the default interface and uses this MTU instead of the
-  default 1500. The 1500 is still the fallback if this for some reason fails. This may stop
-  fragmentation.
 - The default VPN protocol is slowly being changed from OpenVPN to WireGuard.
   The app fetches the ratio between the protocols from the API.
 
@@ -47,6 +44,8 @@ Line wrap the file at 100 chars.                                              Th
 - Update Electron from 18.0.3 to 19.0.13.
 - Expand allowed range of multicast destinations to include all of `239.0.0.0/8` (administratively
   scoped addresses), when local network sharing is enabled.
+- Default to selecting Sweden as the entry location when using WireGuard multihop. Previously,
+  a random location was used.
 
 #### Windows
 - Remove dependency on `ipconfig.exe`. Call `DnsFlushResolverCache` to flush the DNS cache.
diff --git a/mullvad-types/src/relay_constraints.rs b/mullvad-types/src/relay_constraints.rs
index 85db48534a..00dc0e9110 100644
--- a/mullvad-types/src/relay_constraints.rs
+++ b/mullvad-types/src/relay_constraints.rs
@@ -419,7 +419,7 @@ pub struct TransportPort {
     pub port: Constraint<u16>,
 }
 
-/// [`Constraint`]s applicable to OpenVPN relay servers.
+/// [`Constraint`]s applicable to OpenVPN relays.
 #[derive(Debug, Default, Copy, Clone, Eq, PartialEq, Deserialize, Serialize)]
 pub struct OpenVpnConstraints {
     pub port: Constraint<TransportPort>,
@@ -440,7 +440,7 @@ impl fmt::Display for OpenVpnConstraints {
     }
 }
 
-/// [`Constraint`]s applicable to WireGuard relay servers.
+/// [`Constraint`]s applicable to WireGuard relays.
 #[derive(Debug, Default, Clone, Eq, PartialEq, Deserialize, Serialize)]
 #[serde(default)]
 pub struct WireguardConstraints {
diff --git a/mullvad-types/src/settings/mod.rs b/mullvad-types/src/settings/mod.rs
index 3896dd6055..6704800ac5 100644
--- a/mullvad-types/src/settings/mod.rs
+++ b/mullvad-types/src/settings/mod.rs
@@ -2,7 +2,7 @@ use crate::{
     relay_constraints::{
         BridgeConstraints, BridgeSettings, BridgeState, Constraint, LocationConstraint,
         ObfuscationSettings, RelayConstraints, RelaySettings, RelaySettingsUpdate,
-        SelectedObfuscation,
+        SelectedObfuscation, WireguardConstraints,
     },
     wireguard,
 };
@@ -120,6 +120,10 @@ impl Default for Settings {
         Settings {
             relay_settings: RelaySettings::Normal(RelayConstraints {
                 location: Constraint::Only(LocationConstraint::Country("se".to_owned())),
+                wireguard_constraints: WireguardConstraints {
+                    entry_location: Constraint::Only(LocationConstraint::Country("se".to_owned())),
+                    ..Default::default()
+                },
                 ..Default::default()
             }),
             bridge_settings: BridgeSettings::Normal(BridgeConstraints::default()),