Preparing release 2.5_beta2

version.m4, ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index ea1e930a1852b3ea011efe748cebc09f2aebd3e4..de7a8f10b741ce3b4b98e839128eceb04385bb3b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,29 @@
 OpenVPN Change Log
 Copyright (C) 2002-2020 OpenVPN Inc <sales@openvpn.net>
 
+2020.08.26 -- Version 2.5_beta2
+
+Arne Schwabe (1):
+      Fix client's poor man NCP fallback
+
+Eric Thorpe (1):
+      Fixes a bug in management_callback_send_cc_message, should be strlen instead of sizeof
+
+Gert Doering (2):
+      Fix stack overflow in OpenSolaris NEXTADDR()
+      Workaround FreeBSD 12+ race condition on tun/tap open with IPv6.
+
+Lev Stipakov (1):
+      tun.c: enable using wintun driver under SYSTEM
+
+Magnus Kroken (2):
+      doc: fix typos in cipher-negotiation.rst
+      Changes.rst: fix mistyped option names
+
+Selva Nair (1):
+      Improve the documentation for --dhcp-option
+
+
 2020.08.12 -- Version 2.5_beta1
 
 Adam Ciarcin?ski (1):

diff --git a/version.m4 b/version.m4
index 88b38050ea17ed8a4a0a4ac1d4eb1ed6a4069969..7271aa24d39c89246c3d63f789a1436564a6e6e5 100644 (file)
--- a/version.m4
+++ b/version.m4
@@ -3,7 +3,7 @@ define([PRODUCT_NAME], [OpenVPN])
 define([PRODUCT_TARNAME], [openvpn])
 define([PRODUCT_VERSION_MAJOR], [2])
 define([PRODUCT_VERSION_MINOR], [5])
-define([PRODUCT_VERSION_PATCH], [_beta1])
+define([PRODUCT_VERSION_PATCH], [_beta2])
 m4_append([PRODUCT_VERSION], [PRODUCT_VERSION_MAJOR])
 m4_append([PRODUCT_VERSION], [PRODUCT_VERSION_MINOR], [[.]])
 m4_append([PRODUCT_VERSION], [PRODUCT_VERSION_PATCH], [[]])