Merge branch 'merge-release-changes-to-master'

12 files changed, 46 insertions, 39 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 466d15d150..0a6cbe6cd4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,19 +23,10 @@ Line wrap the file at 100 chars.                                              Th
 
 
 ## [Unreleased]
-
 ### Added
-#### Linux
-- Add support for WireGuard's kernel module if it's loaded.
-- Add tray context menu with actions.
 - Improve accessibility in the desktop app.
-- Reset firewall when uninstalling.
-
-#### MacOS
-- Reset firewall whe uninstalling.
 
 ### Changed
-- Open and focus app when opened from context menu instead of toggling the window.
 - Use the API to fetch API IP addresses instead of DNS.
 
 #### Android
@@ -43,10 +34,31 @@ Line wrap the file at 100 chars.                                              Th
 - Add button to remove account and WireGuard key from history in the login screen.
 
 ### Fixed
-- Stop resetting the firewall after an upgrade to not leak after an upgrade.
-- Start key rotation when WireGuard key is first created.
+#### Android
+- Fix connect action button sometimes showing itself as "Cancel" instead of "Secure my connection"
+  for a few seconds.
+- Fix the notification sometimes leaving the foreground and becoming dismissable even if the UI was
+  still visible.
+- Fix crash if connection to service is lost while opening the Split Tunneling settings screen.
+- Fix rare crash that could occur when the tunnel state changes when showing or hiding the quick
+  settings tile.
+- Fix app starting by itself sometimes.
 
-#### Windows
+
+## [2020.6-beta3] - 2020-10-06
+This release is for desktop only.
+
+### Added
+#### Linux
+- Add support for WireGuard's kernel module if it's loaded.
+- Add tray context menu with actions.
+
+### Changed
+#### Linux
+- Open and focus app when opened from context menu instead of toggling the window.
+
+### Fixed
+- Start key rotation when WireGuard key is first created.
 - Remove firewall filters (unblock internet access) when "Always require VPN" is enabled and the app
   is uninstalled.
 
@@ -60,14 +72,6 @@ Line wrap the file at 100 chars.                                              Th
   blocking state and sometimes open the UI for the user to login. Now it always opens the UI.
 - Mark the VPN connection as not metered, so that Android properly reports if the connection is or
   isn't metered based solely on the underlying network, and not on the VPN connection.
-- Fix connect action button sometimes showing itself as "Cancel" instead of "Secure my connection"
-  for a few seconds.
-- Fix the notification sometimes leaving the foreground and becoming dismissable even if the UI was
-  still visible.
-- Fix crash if connection to service is lost while opening the Split Tunneling settings screen.
-- Fix rare crash that could occur when the tunnel state changes when showing or hiding the quick
-  settings tile.
-- Fix app starting by itself sometimes.
 
 #### Linux
 - Fix split tunneling rules preventing `systemd-resolved` from performing DNS lookups for excluded
@@ -75,6 +79,9 @@ Line wrap the file at 100 chars.                                              Th
 - Honor routes other than the default route with `mullvad-exclude`. This is mainly to improve
   routing within LANs.
 
+### Security
+- Stop resetting the firewall after an upgrade to not leak after an upgrade.
+
 
 ## [2020.6-beta2] - 2020-08-27
 This release is for Android only.
diff --git a/Cargo.lock b/Cargo.lock
index cefe826bf8..fcc8fdd5c4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1103,7 +1103,7 @@ dependencies = [
 
 [[package]]
 name = "mullvad-cli"
-version = "2020.6.0-beta2"
+version = "2020.6.0-beta3"
 dependencies = [
  "base64 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1124,7 +1124,7 @@ dependencies = [
 
 [[package]]
 name = "mullvad-daemon"
-version = "2020.6.0-beta2"
+version = "2020.6.0-beta3"
 dependencies = [
  "android_logger 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1164,7 +1164,7 @@ dependencies = [
 
 [[package]]
 name = "mullvad-exclude"
-version = "2020.6.0-beta2"
+version = "2020.6.0-beta3"
 dependencies = [
  "err-derive 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "nix 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1182,9 +1182,9 @@ dependencies = [
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "log-panics 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "mullvad-daemon 2020.6.0-beta2",
+ "mullvad-daemon 2020.6.0-beta3",
  "mullvad-paths 0.1.0",
- "mullvad-problem-report 2020.6.0-beta2",
+ "mullvad-problem-report 2020.6.0-beta3",
  "mullvad-rpc 0.1.0",
  "mullvad-types 0.1.0",
  "nix 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1223,7 +1223,7 @@ dependencies = [
 
 [[package]]
 name = "mullvad-problem-report"
-version = "2020.6.0-beta2"
+version = "2020.6.0-beta3"
 dependencies = [
  "clap 2.33.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "dirs 3.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1269,7 +1269,7 @@ dependencies = [
 
 [[package]]
 name = "mullvad-setup"
-version = "2020.6.0-beta2"
+version = "2020.6.0-beta3"
 dependencies = [
  "clap 2.33.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2358,7 +2358,7 @@ dependencies = [
 
 [[package]]
 name = "talpid-openvpn-plugin"
-version = "2020.6.0-beta2"
+version = "2020.6.0-beta3"
 dependencies = [
  "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "err-derive 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/android/build.gradle b/android/build.gradle
index 4ab4bbcc84..775c5eaeba 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -21,8 +21,8 @@ android {
         applicationId "net.mullvad.mullvadvpn"
         minSdkVersion 24
         targetSdkVersion 29
-        versionCode 20060002
-        versionName "2020.6-beta2"
+        versionCode 20060003
+        versionName "2020.6-beta3"
     }
 
     if (keystorePropertiesFile.exists()) {
diff --git a/dist-assets/windows/version.h b/dist-assets/windows/version.h
index c70b4a4a82..5f47c57772 100644
--- a/dist-assets/windows/version.h
+++ b/dist-assets/windows/version.h
@@ -1,4 +1,4 @@
 #define MAJOR_VERSION 2020
 #define MINOR_VERSION 6
 #define PATCH_VERSION 0
-#define PRODUCT_VERSION "2020.6-beta2"
+#define PRODUCT_VERSION "2020.6-beta3"
diff --git a/gui/package-lock.json b/gui/package-lock.json
index ff5cb53d94..abe0aad1e5 100644
--- a/gui/package-lock.json
+++ b/gui/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "mullvad-vpn",
-  "version": "2020.6.0-beta2",
+  "version": "2020.6.0-beta3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/gui/package.json b/gui/package.json
index d1c80bc418..f96a053f09 100644
--- a/gui/package.json
+++ b/gui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mullvad-vpn",
-  "version": "2020.6.0-beta2",
+  "version": "2020.6.0-beta3",
   "productName": "Mullvad VPN",
   "private": true,
   "description": "Mullvad VPN client",
diff --git a/mullvad-cli/Cargo.toml b/mullvad-cli/Cargo.toml
index a360a74f49..35cc099826 100644
--- a/mullvad-cli/Cargo.toml
+++ b/mullvad-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mullvad-cli"
-version = "2020.6.0-beta2"
+version = "2020.6.0-beta3"
 authors = ["Mullvad VPN"]
 description = "Manage the Mullvad VPN daemon via a convenient CLI"
 license = "GPL-3.0"
diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml
index f7f008ed0a..14ad0bb284 100644
--- a/mullvad-daemon/Cargo.toml
+++ b/mullvad-daemon/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mullvad-daemon"
-version = "2020.6.0-beta2"
+version = "2020.6.0-beta3"
 authors = ["Mullvad VPN"]
 description = "Mullvad VPN daemon. Runs and controls the VPN tunnels"
 license = "GPL-3.0"
diff --git a/mullvad-exclude/Cargo.toml b/mullvad-exclude/Cargo.toml
index 4e34cc1745..4946642063 100644
--- a/mullvad-exclude/Cargo.toml
+++ b/mullvad-exclude/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mullvad-exclude"
-version = "2020.6.0-beta2"
+version = "2020.6.0-beta3"
 authors = ["Mullvad VPN"]
 license = "GPL-3.0"
 edition = "2018"
diff --git a/mullvad-problem-report/Cargo.toml b/mullvad-problem-report/Cargo.toml
index d8debfd101..9b32d40ba9 100644
--- a/mullvad-problem-report/Cargo.toml
+++ b/mullvad-problem-report/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mullvad-problem-report"
-version = "2020.6.0-beta2"
+version = "2020.6.0-beta3"
 authors = ["Mullvad VPN"]
 description = "Collect Mullvad VPN logs into a report and send it to support"
 license = "GPL-3.0"
diff --git a/mullvad-setup/Cargo.toml b/mullvad-setup/Cargo.toml
index 849d0a34b2..68f163826c 100644
--- a/mullvad-setup/Cargo.toml
+++ b/mullvad-setup/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mullvad-setup"
-version = "2020.6.0-beta2"
+version = "2020.6.0-beta3"
 authors = ["Mullvad VPN"]
 description = "Tool used to manage daemon setup"
 license = "GPL-3.0"
diff --git a/talpid-openvpn-plugin/Cargo.toml b/talpid-openvpn-plugin/Cargo.toml
index dee5c89aa2..16767fc001 100644
--- a/talpid-openvpn-plugin/Cargo.toml
+++ b/talpid-openvpn-plugin/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "talpid-openvpn-plugin"
-version = "2020.6.0-beta2"
+version = "2020.6.0-beta3"
 authors = ["Mullvad VPN"]
 description = "OpenVPN shared library plugin for relaying OpenVPN events to talpid_core"
 license = "GPL-3.0"