Backport 2021.5-beta2 changelog and version bump

11 files changed, 21 insertions, 16 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ffa3bd3a7e..27de5a1177 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,11 @@ Line wrap the file at 100 chars.                                              Th
 
 #### macOS
 - Prevent app from showing when dragging tray icon on macOS.
+
+
+## [2021.5-beta2] - 2021-10-19
+### Fixed
+#### macOS
 - Fix issue with getting PF status due to an ABI change on macOS 12 Beta 9.
 
 
diff --git a/Cargo.lock b/Cargo.lock
index 11b0c72c4f..d96debe014 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1199,7 +1199,7 @@ dependencies = [
 
 [[package]]
 name = "mullvad-cli"
-version = "2021.5.0-beta1"
+version = "2021.5.0-beta2"
 dependencies = [
  "base64",
  "chrono",
@@ -1221,7 +1221,7 @@ dependencies = [
 
 [[package]]
 name = "mullvad-daemon"
-version = "2021.5.0-beta1"
+version = "2021.5.0-beta2"
 dependencies = [
  "android_logger",
  "cfg-if 1.0.0",
@@ -1263,7 +1263,7 @@ dependencies = [
 
 [[package]]
 name = "mullvad-exclude"
-version = "2021.5.0-beta1"
+version = "2021.5.0-beta2"
 dependencies = [
  "err-derive",
  "nix 0.22.2",
@@ -1326,7 +1326,7 @@ dependencies = [
 
 [[package]]
 name = "mullvad-problem-report"
-version = "2021.5.0-beta1"
+version = "2021.5.0-beta2"
 dependencies = [
  "clap",
  "dirs-next",
@@ -1374,7 +1374,7 @@ dependencies = [
 
 [[package]]
 name = "mullvad-setup"
-version = "2021.5.0-beta1"
+version = "2021.5.0-beta2"
 dependencies = [
  "clap",
  "env_logger 0.8.4",
@@ -2533,7 +2533,7 @@ dependencies = [
 
 [[package]]
 name = "talpid-openvpn-plugin"
-version = "2021.5.0-beta1"
+version = "2021.5.0-beta2"
 dependencies = [
  "env_logger 0.8.4",
  "err-derive",
diff --git a/dist-assets/windows/version.h b/dist-assets/windows/version.h
index b6fe76989d..07a0845fda 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 PATCH_VERSION 0
-#define PRODUCT_VERSION "2021.5-beta1"
+#define PRODUCT_VERSION "2021.5-beta2"
diff --git a/gui/package-lock.json b/gui/package-lock.json
index d75cc3e08a..e11c562eb4 100644
--- a/gui/package-lock.json
+++ b/gui/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "mullvad-vpn",
-  "version": "2021.5.0-beta1",
+  "version": "2021.5.0-beta2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "mullvad-vpn",
-      "version": "2021.5.0-beta1",
+      "version": "2021.5.0-beta2",
       "hasInstallScript": true,
       "license": "GPL-3.0",
       "dependencies": {
diff --git a/gui/package.json b/gui/package.json
index ae69aa003f..a7cf412e58 100644
--- a/gui/package.json
+++ b/gui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mullvad-vpn",
-  "version": "2021.5.0-beta1",
+  "version": "2021.5.0-beta2",
   "productName": "Mullvad VPN",
   "private": true,
   "description": "Mullvad VPN client",
diff --git a/mullvad-cli/Cargo.toml b/mullvad-cli/Cargo.toml
index c748b55952..0281b0e093 100644
--- a/mullvad-cli/Cargo.toml
+++ b/mullvad-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mullvad-cli"
-version = "2021.5.0-beta1"
+version = "2021.5.0-beta2"
 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 29eb1c0d8b..f19b479d0a 100644
--- a/mullvad-daemon/Cargo.toml
+++ b/mullvad-daemon/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mullvad-daemon"
-version = "2021.5.0-beta1"
+version = "2021.5.0-beta2"
 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 a2898999f5..5422c07433 100644
--- a/mullvad-exclude/Cargo.toml
+++ b/mullvad-exclude/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mullvad-exclude"
-version = "2021.5.0-beta1"
+version = "2021.5.0-beta2"
 authors = ["Mullvad VPN"]
 license = "GPL-3.0"
 edition = "2018"
diff --git a/mullvad-problem-report/Cargo.toml b/mullvad-problem-report/Cargo.toml
index e23efde4d5..efa4d1fe75 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-beta1"
+version = "2021.5.0-beta2"
 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 a3fa6a1d80..b16c1cd8f3 100644
--- a/mullvad-setup/Cargo.toml
+++ b/mullvad-setup/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mullvad-setup"
-version = "2021.5.0-beta1"
+version = "2021.5.0-beta2"
 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 3e94ea62ff..4483d36c6e 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-beta1"
+version = "2021.5.0-beta2"
 authors = ["Mullvad VPN"]
 description = "OpenVPN shared library plugin for relaying OpenVPN events to talpid_core"
 license = "GPL-3.0"