Preparing for OpenVPN 2.3_alpha3

Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>

diff --git a/ChangeLog b/ChangeLog
index 3eb06ed629cfcf5496824deef4fdbfb5f93093f6..9205528e078e958b82945db81c3226fe01d4ffc3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,19 @@
 OpenVPN Change Log
 Copyright (C) 2002-2012 OpenVPN Technologies, Inc. <sales@openvpn.net>
 
+2012.07.20 -- Version 2.3_alpha3
+Arne Schwabe (1):
+      Fix compiling with --disable-management
+
+Gert Doering (1):
+      Repair "tap server" mode brokenness caused by <stdbool.h> fallout
+
+Heiko Hund (4):
+      make non-blocking connect work on Windows
+      don't treat socket related errors special anymore
+      remove unused show_connection_list debug function
+      add option --management-query-proxy
+
 2012.06.29 -- Version 2.3_alpha2
 Adriaan de Jong (11):
       Fixed off-by-one in serial length calculation

diff --git a/version.m4 b/version.m4
index 815fb2968ea3ee45dd8c2a1fea71ee5f48131864..f3f4511eaf722381c59f0762aadb8af45f9a6c9d 100644 (file)
--- a/version.m4
+++ b/version.m4
@@ -1,7 +1,7 @@
 dnl define the OpenVPN version
 define([PRODUCT_NAME], [OpenVPN])
 define([PRODUCT_TARNAME], [openvpn])
-define([PRODUCT_VERSION], [2.3.0_master])
+define([PRODUCT_VERSION], [2.3_alpha3])
 define([PRODUCT_BUGREPORT], [openvpn-users@lists.sourceforge.net])
 define([PRODUCT_VERSION_RESOURCE], [2,3,0,0])
 dnl define the TAP version