Backport 2021.6-beta1 version bump and changelog header

11 files changed, 20 insertions, 17 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e6753c0da..1835c4f4e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,9 @@ Line wrap the file at 100 chars.                                              Th
 
 
 ## [Unreleased]
+
+
+## [2021.6-beta1] - 2021-11-03
 ### Added
 #### Windows
 - Add black monochromatic tray icon for Windows when using light color for tray.
diff --git a/Cargo.lock b/Cargo.lock
index fca01b8956..e49f9d1f00 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1199,7 +1199,7 @@ dependencies = [
 
 [[package]]
 name = "mullvad-cli"
-version = "2021.5.0"
+version = "2021.6.0-beta1"
 dependencies = [
  "base64",
  "chrono",
@@ -1221,7 +1221,7 @@ dependencies = [
 
 [[package]]
 name = "mullvad-daemon"
-version = "2021.5.0"
+version = "2021.6.0-beta1"
 dependencies = [
  "android_logger",
  "cfg-if 1.0.0",
@@ -1263,7 +1263,7 @@ dependencies = [
 
 [[package]]
 name = "mullvad-exclude"
-version = "2021.5.0"
+version = "2021.6.0-beta1"
 dependencies = [
  "err-derive",
  "nix 0.22.2",
@@ -1326,7 +1326,7 @@ dependencies = [
 
 [[package]]
 name = "mullvad-problem-report"
-version = "2021.5.0"
+version = "2021.6.0-beta1"
 dependencies = [
  "clap",
  "dirs-next",
@@ -1375,7 +1375,7 @@ dependencies = [
 
 [[package]]
 name = "mullvad-setup"
-version = "2021.5.0"
+version = "2021.6.0-beta1"
 dependencies = [
  "clap",
  "env_logger 0.8.4",
@@ -2534,7 +2534,7 @@ dependencies = [
 
 [[package]]
 name = "talpid-openvpn-plugin"
-version = "2021.5.0"
+version = "2021.6.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 ca682260d3..fe6d57328c 100644
--- a/dist-assets/windows/version.h
+++ b/dist-assets/windows/version.h
@@ -1,4 +1,4 @@
 #define MAJOR_VERSION 2021
-#define MINOR_VERSION 5
+#define MINOR_VERSION 6
 #define PATCH_VERSION 0
-#define PRODUCT_VERSION "2021.5"
+#define PRODUCT_VERSION "2021.6-beta1"
diff --git a/gui/package-lock.json b/gui/package-lock.json
index d23d2dddf7..7435e829d0 100644
--- a/gui/package-lock.json
+++ b/gui/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "mullvad-vpn",
-  "version": "2021.5.0",
+  "version": "2021.6.0-beta1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "mullvad-vpn",
-      "version": "2021.5.0",
+      "version": "2021.6.0-beta1",
       "hasInstallScript": true,
       "license": "GPL-3.0",
       "dependencies": {
diff --git a/gui/package.json b/gui/package.json
index ad2313f520..eed4f860a6 100644
--- a/gui/package.json
+++ b/gui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mullvad-vpn",
-  "version": "2021.5.0",
+  "version": "2021.6.0-beta1",
   "productName": "Mullvad VPN",
   "private": true,
   "description": "Mullvad VPN client",
diff --git a/mullvad-cli/Cargo.toml b/mullvad-cli/Cargo.toml
index 6a843dfa97..5376d587bc 100644
--- a/mullvad-cli/Cargo.toml
+++ b/mullvad-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mullvad-cli"
-version = "2021.5.0"
+version = "2021.6.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 dc00d46853..474449fe0a 100644
--- a/mullvad-daemon/Cargo.toml
+++ b/mullvad-daemon/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mullvad-daemon"
-version = "2021.5.0"
+version = "2021.6.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 936d775a76..f6e785b6ef 100644
--- a/mullvad-exclude/Cargo.toml
+++ b/mullvad-exclude/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mullvad-exclude"
-version = "2021.5.0"
+version = "2021.6.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 687be65bcc..fd13566f8a 100644
--- a/mullvad-problem-report/Cargo.toml
+++ b/mullvad-problem-report/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mullvad-problem-report"
-version = "2021.5.0"
+version = "2021.6.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 e77b227d03..18c6f0a18f 100644
--- a/mullvad-setup/Cargo.toml
+++ b/mullvad-setup/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mullvad-setup"
-version = "2021.5.0"
+version = "2021.6.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 f2ca0f400a..c498ec8e45 100644
--- a/talpid-openvpn-plugin/Cargo.toml
+++ b/talpid-openvpn-plugin/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "talpid-openvpn-plugin"
-version = "2021.5.0"
+version = "2021.6.0-beta1"
 authors = ["Mullvad VPN"]
 description = "OpenVPN shared library plugin for relaying OpenVPN events to talpid_core"
 license = "GPL-3.0"