From: Gert Doering <gert@greenie.muc.de>
Date: Tue, 6 Dec 2016 20:38:58 +0000 (+0100)
Subject: Preparing release of v2.3.14
X-Git-Tag: v2.3.14^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=117dadc02d163a3e93c28ef7bd296c8dfa1f6156;p=thirdparty%2Fopenvpn.git

Preparing release of v2.3.14

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

diff --git a/ChangeLog b/ChangeLog
index d1a7c9ad0..1c4d0dad9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,30 @@
 OpenVPN Change Log
 Copyright (C) 2002-2015 OpenVPN Technologies, Inc. <sales@openvpn.net>
 
+2016.12.06 -- Version 2.3.14
+Christian Hesse (1):
+      update year in copyright message
+
+David Sommerseth (1):
+      Document the --auth-token option
+
+Gert Doering (2):
+      Repair topology subnet on FreeBSD 11
+      Repair topology subnet on OpenBSD
+
+Lev Stipakov (1):
+      Drop recursively routed packets
+
+Selva Nair (4):
+      Support --block-outside-dns on multiple tunnels
+      When parsing '--setenv opt xx ..' make sure a third parameter is present
+      Map restart signals from event loop to SIGTERM during exit-notification wait
+      Correctly state the default dhcp server address in man page
+
+Steffan Karger (1):
+      Clean up format_hex_ex()
+
+
 2016.11.02 -- Version 2.3.13
 Arne Schwabe (2):
       Use AES ciphers in our sample configuration files and add a few modern 2.4 examples
diff --git a/version.m4 b/version.m4
index 0f2e5e558..33670f854 100644
--- 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.13])
+define([PRODUCT_VERSION], [2.3.14])
 define([PRODUCT_BUGREPORT], [openvpn-users@lists.sourceforge.net])
-define([PRODUCT_VERSION_RESOURCE], [2,3,13,0])
+define([PRODUCT_VERSION_RESOURCE], [2,3,14,0])
 dnl define the TAP version
 define([PRODUCT_TAP_WIN_COMPONENT_ID], [tap0901])
 define([PRODUCT_TAP_WIN_MIN_MAJOR], [9])