Merge branch 'default-to-se'

mullvad · Jan 9, 2018 · 007ba5a · 007ba5a
2 parents 94da355 + 41c3be2
commit 007ba5a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
   app blocks traffic because the tunnel is not connected the tray icon will indicate this with a
   green lock with a red dot.
 - While connecting, a message telling the user that internet accesss is blocked is shown.
+- Default to selecting servers in Sweden to increase the likelyhood of a fast and stable connection.
 
 
 ## [2017.1-beta7] - 2017-12-13

diff --git a/mullvad-daemon/src/settings.rs b/mullvad-daemon/src/settings.rs
@@ -2,8 +2,8 @@ extern crate serde_json;
 
 use app_dirs;
 
-use mullvad_types::relay_constraints::{Constraint, RelayConstraints, RelaySettings,
-                                       RelaySettingsUpdate};
+use mullvad_types::relay_constraints::{Constraint, LocationConstraint, RelayConstraints,
+                                       RelaySettings, RelaySettingsUpdate};
 
 use std::fs::File;
 use std::io;
@@ -44,7 +44,7 @@ impl Default for Settings {
         Settings {
             account_token: None,
             relay_settings: RelaySettings::Normal(RelayConstraints {
-                location: Constraint::Any,
+                location: Constraint::Only(LocationConstraint::Country("se".to_owned())),
                 tunnel: Constraint::Any,
             }),
             allow_lan: false,