From 5395abf84207b868f76691913836d86912886e9c Mon Sep 17 00:00:00 2001
From: Keith Moyer <tomatovpn@keithmoyer.com>
Date: Sat, 19 Dec 2009 15:28:43 -0500
Subject: [PATCH] Upgrade to OpenVPN 2.1.0

---
 release/src/router/openvpn/COPYING                 |   5 +-
 release/src/router/openvpn/ChangeLog               |  11 +
 release/src/router/openvpn/Makefile                |   6 +-
 release/src/router/openvpn/config-win32.h          |   2 +-
 release/src/router/openvpn/config.h                |   6 +-
 release/src/router/openvpn/config.log              | 242 ++++++++++-----------
 release/src/router/openvpn/config.status           |  16 +-
 release/src/router/openvpn/configure               |  18 +-
 release/src/router/openvpn/images/Makefile         |   6 +-
 release/src/router/openvpn/install-win32/Makefile  |   6 +-
 release/src/router/openvpn/openvpn.8               |  15 ++
 release/src/router/openvpn/openvpn.spec            |   2 +-
 release/src/router/openvpn/options.c               |   2 +-
 .../src/router/openvpn/plugin/auth-pam/auth-pam.c  |   4 +-
 .../router/openvpn/plugin/down-root/down-root.c    |   4 +-
 release/src/router/openvpn/service-win32/Makefile  |   6 +-
 release/src/router/openvpn/tap-win32/common.h      |   6 +-
 release/src/router/openvpn/tap-win32/constants.h   |   6 +-
 release/src/router/openvpn/tap-win32/dhcp.c        |   6 +-
 release/src/router/openvpn/tap-win32/dhcp.h        |   6 +-
 release/src/router/openvpn/tap-win32/endian.h      |   6 +-
 release/src/router/openvpn/tap-win32/error.c       |   6 +-
 release/src/router/openvpn/tap-win32/error.h       |   6 +-
 release/src/router/openvpn/tap-win32/filt.py       |  20 ++
 release/src/router/openvpn/tap-win32/hexdump.c     |   6 +-
 release/src/router/openvpn/tap-win32/hexdump.h     |   6 +-
 release/src/router/openvpn/tap-win32/instance.c    |   6 +-
 release/src/router/openvpn/tap-win32/lock.h        |   6 +-
 release/src/router/openvpn/tap-win32/macinfo.c     |   6 +-
 release/src/router/openvpn/tap-win32/macinfo.h     |   6 +-
 release/src/router/openvpn/tap-win32/mem.c         |   6 +-
 release/src/router/openvpn/tap-win32/proto.h       |   6 +-
 release/src/router/openvpn/tap-win32/prototypes.h  |   6 +-
 release/src/router/openvpn/tap-win32/tapdrvr.c     |   6 +-
 .../router/openvpn/tap-win32/{ => tmp}/common.h    |   0
 .../router/openvpn/tap-win32/{ => tmp}/constants.h |   0
 .../src/router/openvpn/tap-win32/{ => tmp}/dhcp.c  |   0
 .../src/router/openvpn/tap-win32/{ => tmp}/dhcp.h  |   0
 .../router/openvpn/tap-win32/{ => tmp}/endian.h    |   0
 .../src/router/openvpn/tap-win32/{ => tmp}/error.c |   0
 .../src/router/openvpn/tap-win32/{ => tmp}/error.h |   0
 .../router/openvpn/tap-win32/{ => tmp}/hexdump.c   |   0
 .../router/openvpn/tap-win32/{ => tmp}/hexdump.h   |   0
 .../router/openvpn/tap-win32/{ => tmp}/instance.c  |   0
 .../src/router/openvpn/tap-win32/{ => tmp}/lock.h  |   0
 .../router/openvpn/tap-win32/{ => tmp}/macinfo.c   |   0
 .../router/openvpn/tap-win32/{ => tmp}/macinfo.h   |   0
 .../src/router/openvpn/tap-win32/{ => tmp}/mem.c   |   0
 .../src/router/openvpn/tap-win32/{ => tmp}/proto.h |   0
 .../openvpn/tap-win32/{ => tmp}/prototypes.h       |   0
 .../router/openvpn/tap-win32/{ => tmp}/tapdrvr.c   |   0
 .../src/router/openvpn/tap-win32/{ => tmp}/types.h |   0
 release/src/router/openvpn/tap-win32/types.h       |   6 +-
 release/src/router/openvpn/version.m4              |   2 +-
 54 files changed, 228 insertions(+), 253 deletions(-)
 create mode 100644 release/src/router/openvpn/tap-win32/filt.py
 copy release/src/router/openvpn/tap-win32/{ => tmp}/common.h (100%)
 mode change 100755 => 100644
 copy release/src/router/openvpn/tap-win32/{ => tmp}/constants.h (100%)
 mode change 100755 => 100644
 copy release/src/router/openvpn/tap-win32/{ => tmp}/dhcp.c (100%)
 mode change 100755 => 100644
 copy release/src/router/openvpn/tap-win32/{ => tmp}/dhcp.h (100%)
 mode change 100755 => 100644
 copy release/src/router/openvpn/tap-win32/{ => tmp}/endian.h (100%)
 mode change 100755 => 100644
 copy release/src/router/openvpn/tap-win32/{ => tmp}/error.c (100%)
 mode change 100755 => 100644
 copy release/src/router/openvpn/tap-win32/{ => tmp}/error.h (100%)
 mode change 100755 => 100644
 copy release/src/router/openvpn/tap-win32/{ => tmp}/hexdump.c (100%)
 mode change 100755 => 100644
 copy release/src/router/openvpn/tap-win32/{ => tmp}/hexdump.h (100%)
 mode change 100755 => 100644
 copy release/src/router/openvpn/tap-win32/{ => tmp}/instance.c (100%)
 mode change 100755 => 100644
 copy release/src/router/openvpn/tap-win32/{ => tmp}/lock.h (100%)
 mode change 100755 => 100644
 copy release/src/router/openvpn/tap-win32/{ => tmp}/macinfo.c (100%)
 mode change 100755 => 100644
 copy release/src/router/openvpn/tap-win32/{ => tmp}/macinfo.h (100%)
 mode change 100755 => 100644
 copy release/src/router/openvpn/tap-win32/{ => tmp}/mem.c (100%)
 mode change 100755 => 100644
 copy release/src/router/openvpn/tap-win32/{ => tmp}/proto.h (100%)
 mode change 100755 => 100644
 copy release/src/router/openvpn/tap-win32/{ => tmp}/prototypes.h (100%)
 mode change 100755 => 100644
 copy release/src/router/openvpn/tap-win32/{ => tmp}/tapdrvr.c (100%)
 mode change 100755 => 100644
 copy release/src/router/openvpn/tap-win32/{ => tmp}/types.h (100%)
 mode change 100755 => 100644

diff --git a/release/src/router/openvpn/COPYING b/release/src/router/openvpn/COPYING
index 21b13cdc88..597c10a427 100644
--- a/release/src/router/openvpn/COPYING
+++ b/release/src/router/openvpn/COPYING
@@ -53,10 +53,7 @@ TAP-Win32/TAP-Win64 Driver license:
 
   The source and object code of the TAP-Win32/TAP-Win64 driver
   is Copyright (C) 2002-2009 OpenVPN Technologies, Inc., and is released under
-  the GPL version 2 (see below), however due to the extra costs of
-  supporting Windows Vista, OpenVPN Technologies, Inc. reserves the right to
-  change the terms of the TAP-Win32/TAP-Win64 license for versions 9.1
-  and higher prior to the official release of OpenVPN 2.1.
+  the GPL version 2.
 
 Windows DDK Samples:
 --------------------
diff --git a/release/src/router/openvpn/ChangeLog b/release/src/router/openvpn/ChangeLog
index 7faba566c7..44747df213 100644
--- a/release/src/router/openvpn/ChangeLog
+++ b/release/src/router/openvpn/ChangeLog
@@ -1,6 +1,17 @@
 OpenVPN Change Log
 Copyright (C) 2002-2009 OpenVPN Technologies, Inc. <sales@openvpn.net>
 
+2009.12.11 -- Version 2.1.0
+
+* Fixed a couple issues in sample plugins auth-pam.c and down-root.c.
+  (1) Fail gracefully rather than segfault if calloc returns NULL.
+  (2) The openvpn_plugin_abort_v1 function can potentially be called
+  with handle == NULL.  Add code to detect this case, and if  so, avoid
+  dereferencing pointers derived from handle  (Thanks to David
+  Sommerseth for finding this bug).
+
+* Documented "multihome" option in the man page.
+
 2009.11.20 -- Version 2.1_rc22
 
 * Fixed a client-side bug on Windows that occurred when the
diff --git a/release/src/router/openvpn/Makefile b/release/src/router/openvpn/Makefile
index 73125abcb7..57b165c203 100644
--- a/release/src/router/openvpn/Makefile
+++ b/release/src/router/openvpn/Makefile
@@ -191,9 +191,9 @@ OBJEXT = o
 PACKAGE = openvpn
 PACKAGE_BUGREPORT = openvpn-users@lists.sourceforge.net
 PACKAGE_NAME = OpenVPN
-PACKAGE_STRING = OpenVPN 2.1_rc22
+PACKAGE_STRING = OpenVPN 2.1.0
 PACKAGE_TARNAME = openvpn
-PACKAGE_VERSION = 2.1_rc22
+PACKAGE_VERSION = 2.1.0
 PATH_SEPARATOR = :
 PTHREAD_CC = 
 PTHREAD_CFLAGS = 
@@ -205,7 +205,7 @@ STRIP = mipsel-uclibc-strip
 TAP_ID = tap0901
 TAP_WIN32_MIN_MAJOR = 9
 TAP_WIN32_MIN_MINOR = 1
-VERSION = 2.1_rc22
+VERSION = 2.1.0
 abs_builddir = /home/keith/firmware/release/src/router/openvpn
 abs_srcdir = /home/keith/firmware/release/src/router/openvpn
 abs_top_builddir = /home/keith/firmware/release/src/router/openvpn
diff --git a/release/src/router/openvpn/config-win32.h b/release/src/router/openvpn/config-win32.h
index 1177103b7e..3f1f3fe1de 100644
--- a/release/src/router/openvpn/config-win32.h
+++ b/release/src/router/openvpn/config-win32.h
@@ -228,7 +228,7 @@ typedef unsigned long in_addr_t;
 #define PACKAGE_TARNAME openvpn
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION 2.1_rc22
+#define PACKAGE_VERSION 2.1.0
 
 /* Define to the full name and version of this package. */
 #ifdef DEBUG_LABEL
diff --git a/release/src/router/openvpn/config.h b/release/src/router/openvpn/config.h
index ef691482c6..fd79a2a84a 100644
--- a/release/src/router/openvpn/config.h
+++ b/release/src/router/openvpn/config.h
@@ -446,13 +446,13 @@
 #define PACKAGE_NAME "OpenVPN"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "OpenVPN 2.1_rc22"
+#define PACKAGE_STRING "OpenVPN 2.1.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "openvpn"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.1_rc22"
+#define PACKAGE_VERSION "2.1.0"
 
 /* Define to the necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -543,7 +543,7 @@
 /* #undef USE_VALGRIND */
 
 /* Version number of package */
-#define VERSION "2.1_rc22"
+#define VERSION "2.1.0"
 
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
diff --git a/release/src/router/openvpn/config.log b/release/src/router/openvpn/config.log
index abdad83800..5c8f48dd94 100644
--- a/release/src/router/openvpn/config.log
+++ b/release/src/router/openvpn/config.log
@@ -1,7 +1,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by OpenVPN configure 2.1_rc22, which was
+It was created by OpenVPN configure 2.1.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ ./configure --host=mipsel-linux CFLAGS=-mips2 -O3 -Wall --disable-plugins --disable-socks --disable-debug --enable-small --enable-password-save --with-ssl-lib=../openssl/ --with-ssl-headers=../openssl/include/ --with-lzo-lib=../lzo/src/.libs/ --with-lzo-headers=../lzo/include
@@ -12,9 +12,9 @@ generated by GNU Autoconf 2.61.  Invocation command line was
 
 hostname = keith-laptop
 uname -m = i686
-uname -r = 2.6.28-16-generic
+uname -r = 2.6.28-17-generic
 uname -s = Linux
-uname -v = #57-Ubuntu SMP Wed Nov 11 09:47:24 UTC 2009
+uname -v = #58-Ubuntu SMP Tue Dec 1 18:57:07 UTC 2009
 
 /usr/bin/uname -p = unknown
 /bin/uname -X     = unknown
@@ -142,11 +142,11 @@ configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -164,11 +164,11 @@ configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -460,11 +460,11 @@ configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -559,11 +559,11 @@ configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -627,11 +627,11 @@ configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -726,11 +726,11 @@ configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -804,11 +804,11 @@ configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -904,11 +904,11 @@ configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -1073,11 +1073,11 @@ configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -1183,11 +1183,11 @@ configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -1343,11 +1343,11 @@ configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -1474,11 +1474,11 @@ configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -1605,11 +1605,11 @@ configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -1750,11 +1750,11 @@ configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -1882,11 +1882,11 @@ configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -2014,11 +2014,11 @@ configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -2272,19 +2272,19 @@ configure:8340: $? = 0
 configure:8358: result: yes
 configure:8278: checking for chsize
 configure:8334: mipsel-uclibc-gcc -o conftest -mips2 -O3 -Wall  -I../openssl/include/ -I../lzo/include -I.  -L../openssl/ -L../lzo/src/.libs/ conftest.c  >&5
-/tmp/ccwpwpZU.o: In function `main':
-/tmp/ccwpwpZU.o(.text+0x1c): undefined reference to `chsize'
+/tmp/ccwZcnxy.o: In function `main':
+/tmp/ccwZcnxy.o(.text+0x1c): undefined reference to `chsize'
 collect2: ld returned 1 exit status
 configure:8340: $? = 1
 configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -2442,19 +2442,19 @@ configure:8340: $? = 0
 configure:8358: result: yes
 configure:8278: checking for getpeereid
 configure:8334: mipsel-uclibc-gcc -o conftest -mips2 -O3 -Wall  -I../openssl/include/ -I../lzo/include -I.  -L../openssl/ -L../lzo/src/.libs/ conftest.c  >&5
-/tmp/cc07Qypj.o: In function `main':
-/tmp/cc07Qypj.o(.text+0x1c): undefined reference to `getpeereid'
+/tmp/ccok0gdX.o: In function `main':
+/tmp/ccok0gdX.o(.text+0x1c): undefined reference to `getpeereid'
 collect2: ld returned 1 exit status
 configure:8340: $? = 1
 configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -2617,11 +2617,11 @@ configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -2764,11 +2764,11 @@ configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -2924,11 +2924,11 @@ configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -3142,19 +3142,19 @@ configure:9701: result: res_init DEFINED
 configure:9723: checking for working epoll implementation...
 configure:9727: checking for epoll_create
 configure:9783: mipsel-uclibc-gcc -o conftest -mips2 -O3 -Wall  -I../openssl/include/ -I../lzo/include -I.  -L../openssl/ -L../lzo/src/.libs/ -Wl,--fatal-warnings conftest.c  >&5
-/tmp/cc0CdMu5.o: In function `main':
-/tmp/cc0CdMu5.o(.text+0x1c): undefined reference to `epoll_create'
+/tmp/ccSxsUCi.o: In function `main':
+/tmp/ccSxsUCi.o(.text+0x1c): undefined reference to `epoll_create'
 collect2: ld returned 1 exit status
 configure:9789: $? = 1
 configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -3369,11 +3369,11 @@ configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -3543,11 +3543,11 @@ configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -3732,11 +3732,11 @@ configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -3884,19 +3884,19 @@ configure:11868: checking for openssl/engine.h
 configure:11876: result: no
 configure:11893: checking for ENGINE_load_builtin_engines
 configure:11949: mipsel-uclibc-gcc -o conftest -mips2 -O3 -Wall  -I../openssl/include/ -I../lzo/include -I.  -L../openssl/ -L../lzo/src/.libs/ conftest.c -lcrypto -llzo2  >&5
-/tmp/ccw4Ddfu.o: In function `main':
-/tmp/ccw4Ddfu.o(.text+0x1c): undefined reference to `ENGINE_load_builtin_engines'
+/tmp/cciQWrGD.o: In function `main':
+/tmp/cciQWrGD.o(.text+0x1c): undefined reference to `ENGINE_load_builtin_engines'
 collect2: ld returned 1 exit status
 configure:11955: $? = 1
 configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -4079,19 +4079,19 @@ configure: failed program was:
 configure:11973: result: no
 configure:11987: checking for ENGINE_register_all_complete
 configure:12043: mipsel-uclibc-gcc -o conftest -mips2 -O3 -Wall  -I../openssl/include/ -I../lzo/include -I.  -L../openssl/ -L../lzo/src/.libs/ conftest.c -lcrypto -llzo2  >&5
-/tmp/ccIOISOf.o: In function `main':
-/tmp/ccIOISOf.o(.text+0x1c): undefined reference to `ENGINE_register_all_complete'
+/tmp/ccgMLgKN.o: In function `main':
+/tmp/ccgMLgKN.o(.text+0x1c): undefined reference to `ENGINE_register_all_complete'
 collect2: ld returned 1 exit status
 configure:12049: $? = 1
 configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -4274,19 +4274,19 @@ configure: failed program was:
 configure:12067: result: no
 configure:12081: checking for ENGINE_cleanup
 configure:12137: mipsel-uclibc-gcc -o conftest -mips2 -O3 -Wall  -I../openssl/include/ -I../lzo/include -I.  -L../openssl/ -L../lzo/src/.libs/ conftest.c -lcrypto -llzo2  >&5
-/tmp/ccMR4Pin.o: In function `main':
-/tmp/ccMR4Pin.o(.text+0x1c): undefined reference to `ENGINE_cleanup'
+/tmp/cc6TUpZW.o: In function `main':
+/tmp/cc6TUpZW.o(.text+0x1c): undefined reference to `ENGINE_cleanup'
 collect2: ld returned 1 exit status
 configure:12143: $? = 1
 configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -4491,11 +4491,11 @@ configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -4662,11 +4662,11 @@ configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -4852,11 +4852,11 @@ configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -5013,11 +5013,11 @@ configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -5213,11 +5213,11 @@ configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "OpenVPN"
 | #define PACKAGE_TARNAME "openvpn"
-| #define PACKAGE_VERSION "2.1_rc22"
-| #define PACKAGE_STRING "OpenVPN 2.1_rc22"
+| #define PACKAGE_VERSION "2.1.0"
+| #define PACKAGE_STRING "OpenVPN 2.1.0"
 | #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 | #define PACKAGE "openvpn"
-| #define VERSION "2.1_rc22"
+| #define VERSION "2.1.0"
 | #define IFCONFIG_PATH "/sbin/ifconfig"
 | #define IPROUTE_PATH "/sbin/ip"
 | #define ROUTE_PATH "/sbin/route"
@@ -5381,7 +5381,7 @@ configure:13230: creating ./config.status
 ## Running config.status. ##
 ## ---------------------- ##
 
-This file was extended by OpenVPN config.status 2.1_rc22, which was
+This file was extended by OpenVPN config.status 2.1.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = 
@@ -5645,9 +5645,9 @@ OBJEXT='o'
 PACKAGE='openvpn'
 PACKAGE_BUGREPORT='openvpn-users@lists.sourceforge.net'
 PACKAGE_NAME='OpenVPN'
-PACKAGE_STRING='OpenVPN 2.1_rc22'
+PACKAGE_STRING='OpenVPN 2.1.0'
 PACKAGE_TARNAME='openvpn'
-PACKAGE_VERSION='2.1_rc22'
+PACKAGE_VERSION='2.1.0'
 PATH_SEPARATOR=':'
 PTHREAD_CC=''
 PTHREAD_CFLAGS=''
@@ -5659,7 +5659,7 @@ STRIP='mipsel-uclibc-strip'
 TAP_ID='tap0901'
 TAP_WIN32_MIN_MAJOR='9'
 TAP_WIN32_MIN_MINOR='1'
-VERSION='2.1_rc22'
+VERSION='2.1.0'
 WIN32_FALSE=''
 WIN32_TRUE='#'
 ac_ct_CC=''
@@ -5718,11 +5718,11 @@ win32datadir='${datadir}/openvpn-win32'
 
 #define PACKAGE_NAME "OpenVPN"
 #define PACKAGE_TARNAME "openvpn"
-#define PACKAGE_VERSION "2.1_rc22"
-#define PACKAGE_STRING "OpenVPN 2.1_rc22"
+#define PACKAGE_VERSION "2.1.0"
+#define PACKAGE_STRING "OpenVPN 2.1.0"
 #define PACKAGE_BUGREPORT "openvpn-users@lists.sourceforge.net"
 #define PACKAGE "openvpn"
-#define VERSION "2.1_rc22"
+#define VERSION "2.1.0"
 #define IFCONFIG_PATH "/sbin/ifconfig"
 #define IPROUTE_PATH "/sbin/ip"
 #define ROUTE_PATH "/sbin/route"
diff --git a/release/src/router/openvpn/config.status b/release/src/router/openvpn/config.status
index cefbe11940..238cb1994a 100755
--- a/release/src/router/openvpn/config.status
+++ b/release/src/router/openvpn/config.status
@@ -288,7 +288,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by OpenVPN $as_me 2.1_rc22, which was
+This file was extended by OpenVPN $as_me 2.1.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -333,7 +333,7 @@ $config_commands
 Report bugs to <bug-autoconf@gnu.org>."
 
 ac_cs_version="\
-OpenVPN config.status 2.1_rc22
+OpenVPN config.status 2.1.0
 configured by ./configure, generated by GNU Autoconf 2.61,
   with options \"'--host=mipsel-linux' 'CFLAGS=-mips2 -O3 -Wall' '--disable-plugins' '--disable-socks' '--disable-debug' '--enable-small' '--enable-password-save' '--with-ssl-lib=../openssl/' '--with-ssl-headers=../openssl/include/' '--with-lzo-lib=../lzo/src/.libs/' '--with-lzo-headers=../lzo/include' 'host_alias=mipsel-linux' 'CC=mipsel-uclibc-gcc'\"
 
@@ -505,8 +505,8 @@ s,@SHELL@,|#_!!_#|/bin/sh,g
 s,@PATH_SEPARATOR@,|#_!!_#|:,g
 s,@PACKAGE_NAME@,|#_!!_#|OpenVPN,g
 s,@PACKAGE_TARNAME@,|#_!!_#|openvpn,g
-s,@PACKAGE_VERSION@,|#_!!_#|2.1_rc22,g
-s,@PACKAGE_STRING@,|#_!!_#|OpenVPN 2.1_rc22,g
+s,@PACKAGE_VERSION@,|#_!!_#|2.1.0,g
+s,@PACKAGE_STRING@,|#_!!_#|OpenVPN 2.1.0,g
 s,@PACKAGE_BUGREPORT@,|#_!!_#|openvpn-users@|#_!!_#|lists.sourceforge.net,g
 s,@exec_prefix@,|#_!!_#|${prefix},g
 s,@prefix@,|#_!!_#|/usr/local,g
@@ -556,7 +556,7 @@ s,@INSTALL_DATA@,|#_!!_#|${INSTALL} -m 644,g
 s,@am__isrc@,|#_!!_#|,g
 s,@CYGPATH_W@,|#_!!_#|echo,g
 s,@PACKAGE@,|#_!!_#|openvpn,g
-s,@VERSION@,|#_!!_#|2.1_rc22,g
+s,@VERSION@,|#_!!_#|2.1.0,g
 s,@ACLOCAL@,|#_!!_#|${SHELL} /home/keith/firmware/release/src/router/openvpn/missing --run aclocal-1.10,g
 s,@AUTOCONF@,|#_!!_#|${SHELL} /home/keith/firmware/release/src/router/openvpn/missing --run autoconf,g
 s,@AUTOMAKE@,|#_!!_#|${SHELL} /home/keith/firmware/release/src/router/openvpn/missing --run automake-1.10,g
@@ -868,11 +868,11 @@ b
 s/$/ /
 s,^\([	 #]*\)[^	 ]*\([	 ]*PACKAGE_NAME\)[	 (].*,\1define\2 "OpenVPN" ,
 s,^\([	 #]*\)[^	 ]*\([	 ]*PACKAGE_TARNAME\)[	 (].*,\1define\2 "openvpn" ,
-s,^\([	 #]*\)[^	 ]*\([	 ]*PACKAGE_VERSION\)[	 (].*,\1define\2 "2.1_rc22" ,
-s,^\([	 #]*\)[^	 ]*\([	 ]*PACKAGE_STRING\)[	 (].*,\1define\2 "OpenVPN 2.1_rc22" ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*PACKAGE_VERSION\)[	 (].*,\1define\2 "2.1.0" ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*PACKAGE_STRING\)[	 (].*,\1define\2 "OpenVPN 2.1.0" ,
 s,^\([	 #]*\)[^	 ]*\([	 ]*PACKAGE_BUGREPORT\)[	 (].*,\1define\2 "openvpn-users@lists.sourceforge.net" ,
 s,^\([	 #]*\)[^	 ]*\([	 ]*PACKAGE\)[	 (].*,\1define\2 "openvpn" ,
-s,^\([	 #]*\)[^	 ]*\([	 ]*VERSION\)[	 (].*,\1define\2 "2.1_rc22" ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*VERSION\)[	 (].*,\1define\2 "2.1.0" ,
 s,^\([	 #]*\)[^	 ]*\([	 ]*IFCONFIG_PATH\)[	 (].*,\1define\2 "/sbin/ifconfig" ,
 s,^\([	 #]*\)[^	 ]*\([	 ]*IPROUTE_PATH\)[	 (].*,\1define\2 "/sbin/ip" ,
 s,^\([	 #]*\)[^	 ]*\([	 ]*ROUTE_PATH\)[	 (].*,\1define\2 "/sbin/route" ,
diff --git a/release/src/router/openvpn/configure b/release/src/router/openvpn/configure
index ee38e95381..e3da6cb274 100755
--- a/release/src/router/openvpn/configure
+++ b/release/src/router/openvpn/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for OpenVPN 2.1_rc22.
+# Generated by GNU Autoconf 2.61 for OpenVPN 2.1.0.
 #
 # Report bugs to <openvpn-users@lists.sourceforge.net>.
 #
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='OpenVPN'
 PACKAGE_TARNAME='openvpn'
-PACKAGE_VERSION='2.1_rc22'
-PACKAGE_STRING='OpenVPN 2.1_rc22'
+PACKAGE_VERSION='2.1.0'
+PACKAGE_STRING='OpenVPN 2.1.0'
 PACKAGE_BUGREPORT='openvpn-users@lists.sourceforge.net'
 
 ac_unique_file="syshead.h"
@@ -1233,7 +1233,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures OpenVPN 2.1_rc22 to adapt to many kinds of systems.
+\`configure' configures OpenVPN 2.1.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1304,7 +1304,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenVPN 2.1_rc22:";;
+     short | recursive ) echo "Configuration of OpenVPN 2.1.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1429,7 +1429,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenVPN configure 2.1_rc22
+OpenVPN configure 2.1.0
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1443,7 +1443,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by OpenVPN $as_me 2.1_rc22, which was
+It was created by OpenVPN $as_me 2.1.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -13523,7 +13523,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by OpenVPN $as_me 2.1_rc22, which was
+This file was extended by OpenVPN $as_me 2.1.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13576,7 +13576,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-OpenVPN config.status 2.1_rc22
+OpenVPN config.status 2.1.0
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/release/src/router/openvpn/images/Makefile b/release/src/router/openvpn/images/Makefile
index 0e2afe24d7..17c0f29f5f 100644
--- a/release/src/router/openvpn/images/Makefile
+++ b/release/src/router/openvpn/images/Makefile
@@ -120,9 +120,9 @@ OBJEXT = o
 PACKAGE = openvpn
 PACKAGE_BUGREPORT = openvpn-users@lists.sourceforge.net
 PACKAGE_NAME = OpenVPN
-PACKAGE_STRING = OpenVPN 2.1_rc22
+PACKAGE_STRING = OpenVPN 2.1.0
 PACKAGE_TARNAME = openvpn
-PACKAGE_VERSION = 2.1_rc22
+PACKAGE_VERSION = 2.1.0
 PATH_SEPARATOR = :
 PTHREAD_CC = 
 PTHREAD_CFLAGS = 
@@ -134,7 +134,7 @@ STRIP = mipsel-uclibc-strip
 TAP_ID = tap0901
 TAP_WIN32_MIN_MAJOR = 9
 TAP_WIN32_MIN_MINOR = 1
-VERSION = 2.1_rc22
+VERSION = 2.1.0
 abs_builddir = /home/keith/firmware/release/src/router/openvpn/images
 abs_srcdir = /home/keith/firmware/release/src/router/openvpn/images
 abs_top_builddir = /home/keith/firmware/release/src/router/openvpn
diff --git a/release/src/router/openvpn/install-win32/Makefile b/release/src/router/openvpn/install-win32/Makefile
index 29a325b0bc..836d7312f6 100644
--- a/release/src/router/openvpn/install-win32/Makefile
+++ b/release/src/router/openvpn/install-win32/Makefile
@@ -134,9 +134,9 @@ OBJEXT = o
 PACKAGE = openvpn
 PACKAGE_BUGREPORT = openvpn-users@lists.sourceforge.net
 PACKAGE_NAME = OpenVPN
-PACKAGE_STRING = OpenVPN 2.1_rc22
+PACKAGE_STRING = OpenVPN 2.1.0
 PACKAGE_TARNAME = openvpn
-PACKAGE_VERSION = 2.1_rc22
+PACKAGE_VERSION = 2.1.0
 PATH_SEPARATOR = :
 PTHREAD_CC = 
 PTHREAD_CFLAGS = 
@@ -148,7 +148,7 @@ STRIP = mipsel-uclibc-strip
 TAP_ID = tap0901
 TAP_WIN32_MIN_MAJOR = 9
 TAP_WIN32_MIN_MINOR = 1
-VERSION = 2.1_rc22
+VERSION = 2.1.0
 abs_builddir = /home/keith/firmware/release/src/router/openvpn/install-win32
 abs_srcdir = /home/keith/firmware/release/src/router/openvpn/install-win32
 abs_top_builddir = /home/keith/firmware/release/src/router/openvpn
diff --git a/release/src/router/openvpn/openvpn.8 b/release/src/router/openvpn/openvpn.8
index 6f6138b70a..45e61fa53c 100644
--- a/release/src/router/openvpn/openvpn.8
+++ b/release/src/router/openvpn/openvpn.8
@@ -2118,6 +2118,21 @@ is specified, and when
 is NOT specified.
 .\"*********************************************************
 .TP
+.B --multihome
+Configure a multi-homed UDP server.  This option can be used when
+OpenVPN has been configured to listen on all interfaces, and will
+attempt to bind client sessions to the interface on which packets
+are being received, so that outgoing packets will be sent out
+of the same interface.  Note that this option is only relevant for
+UDP servers and currently is only implemented on Linux.
+
+Note: clients connecting to a
+.B --multihome
+server should always use the
+.B --nobind
+option.
+.\"*********************************************************
+.TP
 .B --echo [parms...]
 Echo
 .B parms
diff --git a/release/src/router/openvpn/openvpn.spec b/release/src/router/openvpn/openvpn.spec
index 723e2787bc..c42cd29fe8 100644
--- a/release/src/router/openvpn/openvpn.spec
+++ b/release/src/router/openvpn/openvpn.spec
@@ -16,7 +16,7 @@
 
 Summary:	OpenVPN is a robust and highly flexible VPN daemon by James Yonan.
 Name:           openvpn
-Version:        2.1_rc22
+Version:        2.1.0
 Release:	1
 URL:		http://openvpn.net/
 Source0:	http://prdownloads.sourceforge.net/openvpn/%{name}-%{version}.tar.gz
diff --git a/release/src/router/openvpn/options.c b/release/src/router/openvpn/options.c
index ae4825c601..c5ca8b67d5 100644
--- a/release/src/router/openvpn/options.c
+++ b/release/src/router/openvpn/options.c
@@ -2744,7 +2744,7 @@ static void
 usage_version (void)
 {
   msg (M_INFO|M_NOPREFIX, "%s", title_string);
-  msg (M_INFO|M_NOPREFIX, "Developed by James Yonan");
+  msg (M_INFO|M_NOPREFIX, "Originally developed by James Yonan");
   msg (M_INFO|M_NOPREFIX, "Copyright (C) 2002-2009 OpenVPN Technologies, Inc. <sales@openvpn.net>");
   openvpn_exit (OPENVPN_EXIT_STATUS_USAGE); /* exit point */
 }
diff --git a/release/src/router/openvpn/plugin/auth-pam/auth-pam.c b/release/src/router/openvpn/plugin/auth-pam/auth-pam.c
index 52c62db422..b029f85cb4 100644
--- a/release/src/router/openvpn/plugin/auth-pam/auth-pam.c
+++ b/release/src/router/openvpn/plugin/auth-pam/auth-pam.c
@@ -305,6 +305,8 @@ openvpn_plugin_open_v1 (unsigned int *type_mask, const char *argv[], const char
    * Allocate our context
    */
   context = (struct auth_pam_context *) calloc (1, sizeof (struct auth_pam_context));
+  if (!context)
+    goto error;
   context->foreground_fd = -1;
 
   /*
@@ -492,7 +494,7 @@ openvpn_plugin_abort_v1 (openvpn_plugin_handle_t handle)
   struct auth_pam_context *context = (struct auth_pam_context *) handle;
 
   /* tell background process to exit */
-  if (context->foreground_fd >= 0)
+  if (context && context->foreground_fd >= 0)
     {
       send_control (context->foreground_fd, COMMAND_EXIT);
       close (context->foreground_fd);
diff --git a/release/src/router/openvpn/plugin/down-root/down-root.c b/release/src/router/openvpn/plugin/down-root/down-root.c
index 5e0c002eb3..7cf8f181a0 100644
--- a/release/src/router/openvpn/plugin/down-root/down-root.c
+++ b/release/src/router/openvpn/plugin/down-root/down-root.c
@@ -274,6 +274,8 @@ openvpn_plugin_open_v1 (unsigned int *type_mask, const char *argv[], const char
    * Allocate our context
    */
   context = (struct down_root_context *) calloc (1, sizeof (struct down_root_context));
+  if (!context)
+    goto error;
   context->foreground_fd = -1;
 
   /*
@@ -434,7 +436,7 @@ openvpn_plugin_abort_v1 (openvpn_plugin_handle_t handle)
 {
   struct down_root_context *context = (struct down_root_context *) handle;
 
-  if (context->foreground_fd >= 0)
+  if (context && context->foreground_fd >= 0)
     {
       /* tell background process to exit */
       send_control (context->foreground_fd, COMMAND_EXIT);
diff --git a/release/src/router/openvpn/service-win32/Makefile b/release/src/router/openvpn/service-win32/Makefile
index 8f52300a44..bf101a23cf 100644
--- a/release/src/router/openvpn/service-win32/Makefile
+++ b/release/src/router/openvpn/service-win32/Makefile
@@ -130,9 +130,9 @@ OBJEXT = o
 PACKAGE = openvpn
 PACKAGE_BUGREPORT = openvpn-users@lists.sourceforge.net
 PACKAGE_NAME = OpenVPN
-PACKAGE_STRING = OpenVPN 2.1_rc22
+PACKAGE_STRING = OpenVPN 2.1.0
 PACKAGE_TARNAME = openvpn
-PACKAGE_VERSION = 2.1_rc22
+PACKAGE_VERSION = 2.1.0
 PATH_SEPARATOR = :
 PTHREAD_CC = 
 PTHREAD_CFLAGS = 
@@ -144,7 +144,7 @@ STRIP = mipsel-uclibc-strip
 TAP_ID = tap0901
 TAP_WIN32_MIN_MAJOR = 9
 TAP_WIN32_MIN_MINOR = 1
-VERSION = 2.1_rc22
+VERSION = 2.1.0
 abs_builddir = /home/keith/firmware/release/src/router/openvpn/service-win32
 abs_srcdir = /home/keith/firmware/release/src/router/openvpn/service-win32
 abs_top_builddir = /home/keith/firmware/release/src/router/openvpn
diff --git a/release/src/router/openvpn/tap-win32/common.h b/release/src/router/openvpn/tap-win32/common.h
index b7c115762c..c8dcd5d767 100755
--- a/release/src/router/openvpn/tap-win32/common.h
+++ b/release/src/router/openvpn/tap-win32/common.h
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/release/src/router/openvpn/tap-win32/constants.h b/release/src/router/openvpn/tap-win32/constants.h
index fc7855dcd0..220d3d3972 100755
--- a/release/src/router/openvpn/tap-win32/constants.h
+++ b/release/src/router/openvpn/tap-win32/constants.h
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/release/src/router/openvpn/tap-win32/dhcp.c b/release/src/router/openvpn/tap-win32/dhcp.c
index b6b28bb7f3..8ef3917bc6 100755
--- a/release/src/router/openvpn/tap-win32/dhcp.c
+++ b/release/src/router/openvpn/tap-win32/dhcp.c
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/release/src/router/openvpn/tap-win32/dhcp.h b/release/src/router/openvpn/tap-win32/dhcp.h
index 8f40f54004..babe31eca7 100755
--- a/release/src/router/openvpn/tap-win32/dhcp.h
+++ b/release/src/router/openvpn/tap-win32/dhcp.h
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/release/src/router/openvpn/tap-win32/endian.h b/release/src/router/openvpn/tap-win32/endian.h
index ef9376bc4b..7a298f41b2 100755
--- a/release/src/router/openvpn/tap-win32/endian.h
+++ b/release/src/router/openvpn/tap-win32/endian.h
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/release/src/router/openvpn/tap-win32/error.c b/release/src/router/openvpn/tap-win32/error.c
index dd27024e83..82757cce11 100755
--- a/release/src/router/openvpn/tap-win32/error.c
+++ b/release/src/router/openvpn/tap-win32/error.c
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/release/src/router/openvpn/tap-win32/error.h b/release/src/router/openvpn/tap-win32/error.h
index d779af0c00..d3deb28050 100755
--- a/release/src/router/openvpn/tap-win32/error.h
+++ b/release/src/router/openvpn/tap-win32/error.h
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/release/src/router/openvpn/tap-win32/filt.py b/release/src/router/openvpn/tap-win32/filt.py
new file mode 100644
index 0000000000..8fd62249c1
--- /dev/null
+++ b/release/src/router/openvpn/tap-win32/filt.py
@@ -0,0 +1,20 @@
+import sys
+import re
+
+start_re = "(^.*released under the GPL version 2 \(see below\)).*however due"
+skip = 0
+while True:
+    line = sys.stdin.readline()
+    if not line:
+        break
+    m = re.match (start_re, line)
+    if m:
+        g = m.groups()
+        print g[0] + '.'
+        skip = 5
+    if skip > 0:
+        skip -= 1
+    else:
+        print line,
+
+sys.exit(0)
diff --git a/release/src/router/openvpn/tap-win32/hexdump.c b/release/src/router/openvpn/tap-win32/hexdump.c
index f230569c8d..b30a8e7592 100755
--- a/release/src/router/openvpn/tap-win32/hexdump.c
+++ b/release/src/router/openvpn/tap-win32/hexdump.c
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/release/src/router/openvpn/tap-win32/hexdump.h b/release/src/router/openvpn/tap-win32/hexdump.h
index 8814ed1431..cfddcf1296 100755
--- a/release/src/router/openvpn/tap-win32/hexdump.h
+++ b/release/src/router/openvpn/tap-win32/hexdump.h
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/release/src/router/openvpn/tap-win32/instance.c b/release/src/router/openvpn/tap-win32/instance.c
index 1c97823a0b..ef994ee65f 100755
--- a/release/src/router/openvpn/tap-win32/instance.c
+++ b/release/src/router/openvpn/tap-win32/instance.c
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/release/src/router/openvpn/tap-win32/lock.h b/release/src/router/openvpn/tap-win32/lock.h
index c3b52b1c1a..7c3a1a9df3 100755
--- a/release/src/router/openvpn/tap-win32/lock.h
+++ b/release/src/router/openvpn/tap-win32/lock.h
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/release/src/router/openvpn/tap-win32/macinfo.c b/release/src/router/openvpn/tap-win32/macinfo.c
index 49f21f9575..c03a8c5f89 100755
--- a/release/src/router/openvpn/tap-win32/macinfo.c
+++ b/release/src/router/openvpn/tap-win32/macinfo.c
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/release/src/router/openvpn/tap-win32/macinfo.h b/release/src/router/openvpn/tap-win32/macinfo.h
index 60ea8cc3ad..774e5d6ca6 100755
--- a/release/src/router/openvpn/tap-win32/macinfo.h
+++ b/release/src/router/openvpn/tap-win32/macinfo.h
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/release/src/router/openvpn/tap-win32/mem.c b/release/src/router/openvpn/tap-win32/mem.c
index ab4b2ede15..3f8d949748 100755
--- a/release/src/router/openvpn/tap-win32/mem.c
+++ b/release/src/router/openvpn/tap-win32/mem.c
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/release/src/router/openvpn/tap-win32/proto.h b/release/src/router/openvpn/tap-win32/proto.h
index 6c53f401af..e0597725b4 100755
--- a/release/src/router/openvpn/tap-win32/proto.h
+++ b/release/src/router/openvpn/tap-win32/proto.h
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/release/src/router/openvpn/tap-win32/prototypes.h b/release/src/router/openvpn/tap-win32/prototypes.h
index 29502d6039..ff7733aa4d 100755
--- a/release/src/router/openvpn/tap-win32/prototypes.h
+++ b/release/src/router/openvpn/tap-win32/prototypes.h
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/release/src/router/openvpn/tap-win32/tapdrvr.c b/release/src/router/openvpn/tap-win32/tapdrvr.c
index a856734bdc..2c6af48533 100755
--- a/release/src/router/openvpn/tap-win32/tapdrvr.c
+++ b/release/src/router/openvpn/tap-win32/tapdrvr.c
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/release/src/router/openvpn/tap-win32/common.h b/release/src/router/openvpn/tap-win32/tmp/common.h
old mode 100755
new mode 100644
similarity index 100%
copy from release/src/router/openvpn/tap-win32/common.h
copy to release/src/router/openvpn/tap-win32/tmp/common.h
diff --git a/release/src/router/openvpn/tap-win32/constants.h b/release/src/router/openvpn/tap-win32/tmp/constants.h
old mode 100755
new mode 100644
similarity index 100%
copy from release/src/router/openvpn/tap-win32/constants.h
copy to release/src/router/openvpn/tap-win32/tmp/constants.h
diff --git a/release/src/router/openvpn/tap-win32/dhcp.c b/release/src/router/openvpn/tap-win32/tmp/dhcp.c
old mode 100755
new mode 100644
similarity index 100%
copy from release/src/router/openvpn/tap-win32/dhcp.c
copy to release/src/router/openvpn/tap-win32/tmp/dhcp.c
diff --git a/release/src/router/openvpn/tap-win32/dhcp.h b/release/src/router/openvpn/tap-win32/tmp/dhcp.h
old mode 100755
new mode 100644
similarity index 100%
copy from release/src/router/openvpn/tap-win32/dhcp.h
copy to release/src/router/openvpn/tap-win32/tmp/dhcp.h
diff --git a/release/src/router/openvpn/tap-win32/endian.h b/release/src/router/openvpn/tap-win32/tmp/endian.h
old mode 100755
new mode 100644
similarity index 100%
copy from release/src/router/openvpn/tap-win32/endian.h
copy to release/src/router/openvpn/tap-win32/tmp/endian.h
diff --git a/release/src/router/openvpn/tap-win32/error.c b/release/src/router/openvpn/tap-win32/tmp/error.c
old mode 100755
new mode 100644
similarity index 100%
copy from release/src/router/openvpn/tap-win32/error.c
copy to release/src/router/openvpn/tap-win32/tmp/error.c
diff --git a/release/src/router/openvpn/tap-win32/error.h b/release/src/router/openvpn/tap-win32/tmp/error.h
old mode 100755
new mode 100644
similarity index 100%
copy from release/src/router/openvpn/tap-win32/error.h
copy to release/src/router/openvpn/tap-win32/tmp/error.h
diff --git a/release/src/router/openvpn/tap-win32/hexdump.c b/release/src/router/openvpn/tap-win32/tmp/hexdump.c
old mode 100755
new mode 100644
similarity index 100%
copy from release/src/router/openvpn/tap-win32/hexdump.c
copy to release/src/router/openvpn/tap-win32/tmp/hexdump.c
diff --git a/release/src/router/openvpn/tap-win32/hexdump.h b/release/src/router/openvpn/tap-win32/tmp/hexdump.h
old mode 100755
new mode 100644
similarity index 100%
copy from release/src/router/openvpn/tap-win32/hexdump.h
copy to release/src/router/openvpn/tap-win32/tmp/hexdump.h
diff --git a/release/src/router/openvpn/tap-win32/instance.c b/release/src/router/openvpn/tap-win32/tmp/instance.c
old mode 100755
new mode 100644
similarity index 100%
copy from release/src/router/openvpn/tap-win32/instance.c
copy to release/src/router/openvpn/tap-win32/tmp/instance.c
diff --git a/release/src/router/openvpn/tap-win32/lock.h b/release/src/router/openvpn/tap-win32/tmp/lock.h
old mode 100755
new mode 100644
similarity index 100%
copy from release/src/router/openvpn/tap-win32/lock.h
copy to release/src/router/openvpn/tap-win32/tmp/lock.h
diff --git a/release/src/router/openvpn/tap-win32/macinfo.c b/release/src/router/openvpn/tap-win32/tmp/macinfo.c
old mode 100755
new mode 100644
similarity index 100%
copy from release/src/router/openvpn/tap-win32/macinfo.c
copy to release/src/router/openvpn/tap-win32/tmp/macinfo.c
diff --git a/release/src/router/openvpn/tap-win32/macinfo.h b/release/src/router/openvpn/tap-win32/tmp/macinfo.h
old mode 100755
new mode 100644
similarity index 100%
copy from release/src/router/openvpn/tap-win32/macinfo.h
copy to release/src/router/openvpn/tap-win32/tmp/macinfo.h
diff --git a/release/src/router/openvpn/tap-win32/mem.c b/release/src/router/openvpn/tap-win32/tmp/mem.c
old mode 100755
new mode 100644
similarity index 100%
copy from release/src/router/openvpn/tap-win32/mem.c
copy to release/src/router/openvpn/tap-win32/tmp/mem.c
diff --git a/release/src/router/openvpn/tap-win32/proto.h b/release/src/router/openvpn/tap-win32/tmp/proto.h
old mode 100755
new mode 100644
similarity index 100%
copy from release/src/router/openvpn/tap-win32/proto.h
copy to release/src/router/openvpn/tap-win32/tmp/proto.h
diff --git a/release/src/router/openvpn/tap-win32/prototypes.h b/release/src/router/openvpn/tap-win32/tmp/prototypes.h
old mode 100755
new mode 100644
similarity index 100%
copy from release/src/router/openvpn/tap-win32/prototypes.h
copy to release/src/router/openvpn/tap-win32/tmp/prototypes.h
diff --git a/release/src/router/openvpn/tap-win32/tapdrvr.c b/release/src/router/openvpn/tap-win32/tmp/tapdrvr.c
old mode 100755
new mode 100644
similarity index 100%
copy from release/src/router/openvpn/tap-win32/tapdrvr.c
copy to release/src/router/openvpn/tap-win32/tmp/tapdrvr.c
diff --git a/release/src/router/openvpn/tap-win32/types.h b/release/src/router/openvpn/tap-win32/tmp/types.h
old mode 100755
new mode 100644
similarity index 100%
copy from release/src/router/openvpn/tap-win32/types.h
copy to release/src/router/openvpn/tap-win32/tmp/types.h
diff --git a/release/src/router/openvpn/tap-win32/types.h b/release/src/router/openvpn/tap-win32/types.h
index 4adee6a6f3..48bdff74ba 100755
--- a/release/src/router/openvpn/tap-win32/types.h
+++ b/release/src/router/openvpn/tap-win32/types.h
@@ -5,11 +5,7 @@
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
  *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
- *  and is released under the GPL version 2 (see below), however due
- *  to the extra costs of supporting Windows Vista, OpenVPN Solutions
- *  LLC reserves the right to change the terms of the TAP-Win32/TAP-Win64
- *  license for versions 9.1 and higher prior to the official release of
- *  OpenVPN 2.1.
+ *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
diff --git a/release/src/router/openvpn/version.m4 b/release/src/router/openvpn/version.m4
index 1d67696d23..23306ea8b9 100644
--- a/release/src/router/openvpn/version.m4
+++ b/release/src/router/openvpn/version.m4
@@ -1,5 +1,5 @@
 dnl define the OpenVPN version
-define(PRODUCT_VERSION,[2.1_rc22])
+define(PRODUCT_VERSION,[2.1.0])
 dnl define the TAP version
 define(PRODUCT_TAP_ID,[tap0901])
 define(PRODUCT_TAP_WIN32_MIN_MAJOR,[9])
-- 
2.11.4.GIT