Merge branch 'port-2018.5-beta1-updates-to-master'

7 files changed, 24 insertions, 15 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6409a27013..4cad4a8f37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,21 @@ Line wrap the file at 100 chars.                                              Th
 
 ## [Unreleased]
 ### Added
+- CLI command `relay update` that triggers an update of the relay list in the daemon.
+
+#### macOS
+- Detect if the computer is offline. If so, don't sit in a reconnect loop, instead block and show
+  an error message.
+
+### Fixed
+- Cancel pending system notifications when the app becomes visible.
+
+#### Windows
+- Use proper app id in the registry. This avoids false-positives with certain anti-virus software.
+
+
+## [2018.5-beta1] - 2018-11-12
+### Added
 - Fall back and try to connect over TCP port 443 if protocol is set to automatic and two attempts
   with UDP fail in a row. If that also fails, alternate between UDP and TCP with random ports.
 - Add new system and in-app notifications to inform the user when the app becomes outdated,
@@ -31,16 +46,10 @@ Line wrap the file at 100 chars.                                              Th
 - Allow the user to view the relay in/out IP address in the GUI.
 - Add OpenVPN proxy support via CLI.
 - Allow DHCPv6 in the firewall.
-- CLI command `relay update` that triggers an update of the relay list in the daemon.
-
-# macOS
-- Detect if the computer is offline. If so, don't sit in a reconnect loop, instead block and show
-  an error message.
 
 ### Fixed
 - Pick new random relay for each reconnect attempt instead of just retrying with the same one.
 - Make the `problem-report` tool fall back to the bundled API IP if DNS resolution fails.
-- Cancel pending system notifications when the app becomes visible.
 
 #### macOS
 - Correctly backup and restore search domains and other DNS settings.
@@ -52,7 +61,6 @@ Line wrap the file at 100 chars.                                              Th
 - Set DNS search domain when using the systemd-resolved. Makes it work on Ubuntu 18.10.
 
 #### Windows
-- Use proper app id in the registry. This avoids false-positives with certain anti-virus software.
 - Fix crash on Windows 7 when closing installer.
 
 ### Security
diff --git a/Cargo.lock b/Cargo.lock
index aedf6df6a1..5d127fb999 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -909,7 +909,7 @@ dependencies = [
 
 [[package]]
 name = "mullvad-cli"
-version = "2018.4.0"
+version = "2018.5.0-beta1"
 dependencies = [
  "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -927,7 +927,7 @@ dependencies = [
 
 [[package]]
 name = "mullvad-daemon"
-version = "2018.4.0"
+version = "2018.5.0-beta1"
 dependencies = [
  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -993,7 +993,7 @@ dependencies = [
 
 [[package]]
 name = "mullvad-problem-report"
-version = "2018.4.0"
+version = "2018.5.0-beta1"
 dependencies = [
  "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/gui/packages/desktop/package.json b/gui/packages/desktop/package.json
index 78a4b8a083..4af9f90ff0 100644
--- a/gui/packages/desktop/package.json
+++ b/gui/packages/desktop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "desktop",
-  "version": "2018.4.0",
+  "version": "2018.5.0-beta1",
   "productName": "Mullvad VPN",
   "private": true,
   "description": "Mullvad VPN client",
diff --git a/mullvad-cli/Cargo.toml b/mullvad-cli/Cargo.toml
index 3a21d963cc..68796fcf66 100644
--- a/mullvad-cli/Cargo.toml
+++ b/mullvad-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mullvad-cli"
-version = "2018.4.0"
+version = "2018.5.0-beta1"
 authors = [
     "Mullvad VPN <admin@mullvad.net>",
     "Andrej Mihajlov <and@mullvad.net>",
diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml
index 406c48f09b..eeb8d2a40f 100644
--- a/mullvad-daemon/Cargo.toml
+++ b/mullvad-daemon/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mullvad-daemon"
-version = "2018.4.0"
+version = "2018.5.0-beta1"
 authors = [
     "Mullvad VPN <admin@mullvad.net>",
     "Andrej Mihajlov <and@mullvad.net>",
diff --git a/mullvad-problem-report/Cargo.toml b/mullvad-problem-report/Cargo.toml
index 307e0c79c9..7c63b63c7d 100644
--- a/mullvad-problem-report/Cargo.toml
+++ b/mullvad-problem-report/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mullvad-problem-report"
-version = "2018.4.0"
+version = "2018.5.0-beta1"
 authors = [
     "Mullvad VPN <admin@mullvad.net>",
     "Andrej Mihajlov <and@mullvad.net>",
diff --git a/prepare_release.sh b/prepare_release.sh
index 814e82de37..ad71bf6540 100755
--- a/prepare_release.sh
+++ b/prepare_release.sh
@@ -39,7 +39,8 @@ sed -i.bak -Ee "s/^version = \"[^\"]+\"\$/version = \"$SEMVER_VERSION\"/g" \
     mullvad-problem-report/Cargo.toml
 
 echo "Syncing Cargo.lock with new version numbers"
-cargo update --package mullvad-daemon
+source env.sh
+cargo build
 
 echo "Commiting metadata changes to git..."
 git commit -S -m "Updating version in package files" \