Preparing for release v2.3.6 (ChangeLog, version.m4)

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

diff --git a/ChangeLog b/ChangeLog
index 08c4cc0d531166e20f6cce3737ee7994a7954ce9..c1f8a50ea3c6a9eaf7b9c404bf9deb9230fb86b4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,23 @@
 OpenVPN Change Log
 Copyright (C) 2002-2014 OpenVPN Technologies, Inc. <sales@openvpn.net>
 
+2014.11.28 -- Version 2.3.6
+David Sommerseth (1):
+      systemd: Reworked the systemd unit file to handle server and client configs better
+
+Gert Doering (1):
+      Add client-only support for peer-id.
+
+Samuli Seppänen (1):
+      Fix to --shaper documentation on the man-page
+
+Steffan Karger (4):
+      Fix assertion error when using --cipher none
+      Add --tls-version-max
+      Modernize sample keys and sample configs
+      Drop too-short control channel packets instead of asserting out.
+
+
 2014.10.24 -- Version 2.3.5
 Andris Kalnozols (2):
       Fix some typos in the man page.

diff --git a/version.m4 b/version.m4
index 0bd830f36ef5492d3cb991cbb65ac757e50a9e2d..946c8fa7e88908c5706cf41fe7a90bc981cd5cd8 100644 (file)
--- a/version.m4
+++ b/version.m4
@@ -1,9 +1,9 @@
 dnl define the OpenVPN version
 define([PRODUCT_NAME], [OpenVPN])
 define([PRODUCT_TARNAME], [openvpn])
-define([PRODUCT_VERSION], [2.3.5])
+define([PRODUCT_VERSION], [2.3.6])
 define([PRODUCT_BUGREPORT], [openvpn-users@lists.sourceforge.net])
-define([PRODUCT_VERSION_RESOURCE], [2,3,5,0])
+define([PRODUCT_VERSION_RESOURCE], [2,3,6,0])
 dnl define the TAP version
 define([PRODUCT_TAP_WIN_COMPONENT_ID], [tap0901])
 define([PRODUCT_TAP_WIN_MIN_MAJOR], [9])