Preparing release 2.5_rc2

Version.m4, ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index 56f6a923d6219ad9627079c53c72c846e3a921fb..447c374d5a4b11ec2b2dc064730de12f03201a1c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,25 @@
 OpenVPN Change Log
 Copyright (C) 2002-2020 OpenVPN Inc <sales@openvpn.net>
 
+2020.09.30 -- Version 2.5_rc2
+
+Lev Stipakov (1):
+      Alias ADAPTER_DOMAIN_SUFFIX to DOMAIN
+
+Selva Nair (2):
+      Set DNS Domain using iservice
+      Improve documentation of --username-as-common-name
+
+Simon Rozman (4):
+      netsh: Specify interfaces by index rather than name
+      netsh: Clear existing IPv6 DNS servers before configuring new ones
+      netsh: Delete WINS servers on TUN close
+      openvpnmsica: Simplify find_adapters() to void return
+
+Vladislav Grishenko (1):
+      Fix update_time() and openvpn_gettimeofday() coexistence
+
+
 2020.09.21 -- Version 2.5_rc1
 
 David Sommerseth (4):

diff --git a/version.m4 b/version.m4
index 248f8d044b1c70a17b0eec2fc84276ce6d933471..38b35ecaac494eaa7fc2ea9c4d34f2b993dc7749 100644 (file)
--- 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], [_rc1])
+define([PRODUCT_VERSION_PATCH], [_rc2])
 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,5])
+define([PRODUCT_VERSION_RESOURCE], [2,5,0,6])
 dnl define the TAP version
 define([PRODUCT_TAP_WIN_COMPONENT_ID], [tap0901])
 define([PRODUCT_TAP_WIN_MIN_MAJOR], [9])