From: Gert Doering <gert@greenie.muc.de>
Date: Wed, 26 Aug 2020 12:17:26 +0000 (+0200)
Subject: Preparing release 2.5_beta2
X-Git-Tag: v2.5_beta2^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ec42591063fba4a4c5bf1d7d8d55a323165de4f;p=thirdparty%2Fopenvpn.git

Preparing release 2.5_beta2

version.m4, ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index ea1e930a1..de7a8f10b 100644
--- 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 88b38050e..7271aa24d 100644
--- 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], [[]])