summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2008-01-24 07:44:49 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2008-01-24 07:44:49 +0000
commit9a569a97c96d1edd28deeca2a24986236ddc97a9 (patch)
tree9d1251f29fb5f5fa16e063e3c7135ac3d2bbb5d5
parente9a57dcd98e25183d2a26a6b050876d7e026f93f (diff)
downloadopenvpn-9a569a97c96d1edd28deeca2a24986236ddc97a9.tar.gz
openvpn-9a569a97c96d1edd28deeca2a24986236ddc97a9.tar.xz
openvpn-9a569a97c96d1edd28deeca2a24986236ddc97a9.zip
VERSION 2.1_rc6v2.1_rc6
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@2666 e7ae566f-a301-0410-adde-c780ea21d3b5
-rw-r--r--ChangeLog7
-rw-r--r--version.m42
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b0a5c0f..4a46a68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,13 @@ Copyright (C) 2002-2005 OpenVPN Solutions LLC <info@openvpn.net>
$Id$
+2008.01.24 -- Version 2.1_rc6
+
+* Fixed options checking bug introduced in rc5 where legitimate configuration
+ files might elicit the error: "Options error: Parameter pkcs11_private_mode
+ can only be specified in TLS-mode, i.e. where --tls-server or --tls-client
+ is also specified."
+
2008.01.23 -- Version 2.1_rc5
* Fixed Win2K TAP driver bug that was introduced by Vista fixes,
diff --git a/version.m4 b/version.m4
index c45830c..fcc3862 100644
--- a/version.m4
+++ b/version.m4
@@ -1,2 +1,2 @@
dnl define the OpenVPN version
-define(PRODUCT_VERSION,[2.1_rc5])
+define(PRODUCT_VERSION,[2.1_rc6])