11 files changed, 46 insertions, 31 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3a96afd46..e62c7fb2bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,14 +23,38 @@ Line wrap the file at 100 chars.                                              Th
 
 
 ## [Unreleased]
+### Added
+#### Windows
+- Add black monochromatic tray icon for Windows when using light color for tray.
+
+### Changed
+- Update Electron from 11.4.9 to 15.0.0.
+
+#### Android
+- Drop support for Android 7/7.1 (Android 8/API level 26 or later is now required).
+
+### Fixed
+- Fix desktop app showing a future date for when WireGuard key was generated.
+
+#### Android
+- Fix reconnect on app resume.
+- Fix invalid URLs. Rely on browser locale rather than app/system language.
+
+#### macOS
+- Prevent app from showing when dragging tray icon on macOS.
 
+
+## [2021.5-beta1] - 2021-10-12
 ### Added
 - Added possibility to filter locations by provider in the desktop app.
-- Add WireGuard over TCP CLI option for all relays.
+- Add ability to use WireGuard over TCP towards all relays via the desktop CLI. However,
+  this service is not yet available on all relays. At the time of writing, this only
+  works towards `se6-wireguard`, `se9-wireguard` and `se17-wireguard`.
 - Add GUI environment variable `MULLVAD_DISABLE_UPDATE_NOTIFICATION`. If set to `1`, GUI
-  notification will be disabled when an update is available.
-- Add setting for changing between IPv4 and IPv6 for the connection to WireGuard servers on desktop.
-- Add black monochromatic tray icon for Windows when using light color for tray.
+  notification will be disabled when an update is available. This is not intended to be set by
+  normal users.
+- Add setting for changing between IPv4 and IPv6 for the connection to WireGuard servers on
+  desktop.
 
 #### Android
 - Added toggle for Split tunneling view to be able to show system apps
@@ -38,7 +62,7 @@ Line wrap the file at 100 chars.                                              Th
 #### Windows
 - Resolve symbolic links and junctions for excluded apps.
 - Add opt-in support for NT kernel WireGuard driver. It can be enabled in the CLI.
-- Add monochromatic black icon on Windows for use with light themes.
+  Should give better performance. Especially over Wi-Fi.
 
 ### Changed
 - Only use the account history file to store the last used account.
@@ -49,7 +73,6 @@ Line wrap the file at 100 chars.                                              Th
 - Update Electron from 11.2.3 to 11.4.9.
 - Move OpenVPN and WireGuard settings in the advanced settings view into separate settings views.
 - Return to main view in desktop app after being hidden/closed for two minutes.
-- Update Electron from 11.4.9 to 15.0.0.
 
 #### Linux
 - Always send DNS requests inside the tunnel for excluded processes when using public custom DNS.
@@ -58,9 +81,6 @@ Line wrap the file at 100 chars.                                              Th
 - Upgrade Wintun from 0.10.4 to 0.13.
 - Reduce tunnel setup time for OpenVPN by disabling DAD.
 
-#### Android
-- Drop support for Android 7/7.1 (Android 8/API level 26 or later is now required).
-
 ### Fixed
 - Fix link to download page not always using the beta URL when it should.
 - Fix deadlock that may occur when the API cannot be reached while entering the connecting state.
@@ -79,7 +99,6 @@ Line wrap the file at 100 chars.                                              Th
 - Improve responsiveness of the controls and status text in the main view in the desktop app.
 - Read macOS scrollbar visibility settings to decide wheter or not the scrollbars should hide when
   not scrolling.
-- Fix desktop app showing a future date for when WireGuard key was generated.
 - Fix IPv6 connections to WireGuard servers by not dropping select neighbor advertisements and
   solicitations.
 
@@ -109,11 +128,7 @@ Line wrap the file at 100 chars.                                              Th
 - Fix erasing wireguard MTU value in some scenarious.
 - Fix initial state of Split tunneling excluded apps list. Previously it was not notified the daemon
 properly after initialization.
-- Fix reconnect on app resume.
-- Fix invalid URLs. Rely on browser locale rather than app/system language.
 
-#### macOS
-- Prevent app from showing when dragging tray icon on macOS.
 
 ## [2021.4] - 2021-06-30
 This release is for desktop only.
diff --git a/Cargo.lock b/Cargo.lock
index a673ff50fc..e5bbf2dfb5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1199,7 +1199,7 @@ dependencies = [
 
 [[package]]
 name = "mullvad-cli"
-version = "2021.4.0"
+version = "2021.5.0-beta1"
 dependencies = [
  "base64",
  "chrono",
@@ -1221,7 +1221,7 @@ dependencies = [
 
 [[package]]
 name = "mullvad-daemon"
-version = "2021.4.0"
+version = "2021.5.0-beta1"
 dependencies = [
  "android_logger",
  "cfg-if 1.0.0",
@@ -1263,7 +1263,7 @@ dependencies = [
 
 [[package]]
 name = "mullvad-exclude"
-version = "2021.4.0"
+version = "2021.5.0-beta1"
 dependencies = [
  "err-derive",
  "nix 0.22.2",
@@ -1326,7 +1326,7 @@ dependencies = [
 
 [[package]]
 name = "mullvad-problem-report"
-version = "2021.4.0"
+version = "2021.5.0-beta1"
 dependencies = [
  "clap",
  "dirs-next",
@@ -1374,7 +1374,7 @@ dependencies = [
 
 [[package]]
 name = "mullvad-setup"
-version = "2021.4.0"
+version = "2021.5.0-beta1"
 dependencies = [
  "clap",
  "env_logger 0.8.4",
@@ -2523,7 +2523,7 @@ dependencies = [
 
 [[package]]
 name = "talpid-openvpn-plugin"
-version = "2021.4.0"
+version = "2021.5.0-beta1"
 dependencies = [
  "env_logger 0.8.4",
  "err-derive",
diff --git a/dist-assets/windows/version.h b/dist-assets/windows/version.h
index 6d1daaa9ef..b6fe76989d 100644
--- a/dist-assets/windows/version.h
+++ b/dist-assets/windows/version.h
@@ -1,4 +1,4 @@
 #define MAJOR_VERSION 2021
-#define MINOR_VERSION 4
+#define MINOR_VERSION 5
 #define PATCH_VERSION 0
-#define PRODUCT_VERSION "2021.4"
+#define PRODUCT_VERSION "2021.5-beta1"
diff --git a/gui/package-lock.json b/gui/package-lock.json
index 01bdfccf26..d75cc3e08a 100644
--- a/gui/package-lock.json
+++ b/gui/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "mullvad-vpn",
-  "version": "2021.4.0",
+  "version": "2021.5.0-beta1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "mullvad-vpn",
-      "version": "2021.4.0",
+      "version": "2021.5.0-beta1",
       "hasInstallScript": true,
       "license": "GPL-3.0",
       "dependencies": {
diff --git a/gui/package.json b/gui/package.json
index 2eb1b8f35b..ae69aa003f 100644
--- a/gui/package.json
+++ b/gui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mullvad-vpn",
-  "version": "2021.4.0",
+  "version": "2021.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 d449ae236f..c748b55952 100644
--- a/mullvad-cli/Cargo.toml
+++ b/mullvad-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mullvad-cli"
-version = "2021.4.0"
+version = "2021.5.0-beta1"
 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 e9b5b7ece9..29eb1c0d8b 100644
--- a/mullvad-daemon/Cargo.toml
+++ b/mullvad-daemon/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mullvad-daemon"
-version = "2021.4.0"
+version = "2021.5.0-beta1"
 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 1b97159e56..a2898999f5 100644
--- a/mullvad-exclude/Cargo.toml
+++ b/mullvad-exclude/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mullvad-exclude"
-version = "2021.4.0"
+version = "2021.5.0-beta1"
 authors = ["Mullvad VPN"]
 license = "GPL-3.0"
 edition = "2018"
diff --git a/mullvad-problem-report/Cargo.toml b/mullvad-problem-report/Cargo.toml
index a0d130fb0e..e23efde4d5 100644
--- a/mullvad-problem-report/Cargo.toml
+++ b/mullvad-problem-report/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mullvad-problem-report"
-version = "2021.4.0"
+version = "2021.5.0-beta1"
 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 e739d188b4..a3fa6a1d80 100644
--- a/mullvad-setup/Cargo.toml
+++ b/mullvad-setup/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mullvad-setup"
-version = "2021.4.0"
+version = "2021.5.0-beta1"
 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 237fe5ec55..3e94ea62ff 100644
--- a/talpid-openvpn-plugin/Cargo.toml
+++ b/talpid-openvpn-plugin/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "talpid-openvpn-plugin"
-version = "2021.4.0"
+version = "2021.5.0-beta1"
 authors = ["Mullvad VPN"]
 description = "OpenVPN shared library plugin for relaying OpenVPN events to talpid_core"
 license = "GPL-3.0"