Preparing release 2.5_beta4v2.5_beta4

Version.m4, ChangeLog

Signed-off-by: Gert Doering <gert@greenie.muc.de>

2 files changed, 19 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index f516b5a..567e0d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,23 @@
 OpenVPN Change Log
 Copyright (C) 2002-2020 OpenVPN Inc <sales@openvpn.net>
 
+2020.09.10 -- Version 2.5_beta4
+
+Gert Doering (3):
+      Document that --push-remove is generally more suitable than --push-reset
+      Fix error detection / abort in --inetd corner case.
+      Fix TUNSETGROUP compatibility with very old Linux systems.
+
+Lev Stipakov (1):
+      openvpnmsica: make adapter renaming non-fatal
+
+Selva Nair (1):
+      In tap.c use DiInstallDevice to install the driver on a new adapter
+
+Vladislav Grishenko (1):
+      Fix best gateway selection over netlink
+
+
 2020.08.31 -- Version 2.5_beta3
 
 Arne Schwabe (1):
diff --git a/version.m4 b/version.m4
index db690c7..903c87a 100644
--- a/version.m4
+++ b/version.m4
@@ -3,12 +3,12 @@ define([PRODUCT_NAME], [OpenVPN])
 define([PRODUCT_TARNAME], [openvpn])
 define([PRODUCT_VERSION_MAJOR], [2])
 define([PRODUCT_VERSION_MINOR], [5])
-define([PRODUCT_VERSION_PATCH], [_beta3])
+define([PRODUCT_VERSION_PATCH], [_beta4])
 m4_append([PRODUCT_VERSION], [PRODUCT_VERSION_MAJOR])
 m4_append([PRODUCT_VERSION], [PRODUCT_VERSION_MINOR], [[.]])
 m4_append([PRODUCT_VERSION], [PRODUCT_VERSION_PATCH], [[]])
 define([PRODUCT_BUGREPORT], [openvpn-users@lists.sourceforge.net])
-define([PRODUCT_VERSION_RESOURCE], [2,5,0,3])
+define([PRODUCT_VERSION_RESOURCE], [2,5,0,4])
 dnl define the TAP version
 define([PRODUCT_TAP_WIN_COMPONENT_ID], [tap0901])
 define([PRODUCT_TAP_WIN_MIN_MAJOR], [9])