Releasing 1.0.22.

diff --git a/NEWS b/NEWS
index 398e63ba063249e98de3b2d21423683ca2683a2b..9c1004cd8dcb42db54a32caffd63efcd8b53d772 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+Version 1.0.22               August 13 2013
+
+ * Fixed the combination of Mode = router and DeviceType = tap.
+
+ * The $NAME variable is now set in subnet-up/down scripts.
+
+ * Tinc now gives an error when unknown options are given on the command line.
+
+ * Tinc now correctly handles a space between a short command line option and
+   an optional argument.
+
+Thanks to Etienne Dechamps for his contribution to this version of tinc.
+
 Version 1.0.21               April 22 2013
 
  * Drop packets forwarded via TCP if they are too big (CVE-2013-1428).

diff --git a/README b/README
index 09495f713440de3d4ede762ce9f8940717ef5d12..de3720fe0afa8094e0b5ea5e0c31fce297913fdb 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is the README file for tinc version 1.0.21. Installation
+This is the README file for tinc version 1.0.22. Installation
 instructions may be found in the INSTALL file.
 
 tinc is Copyright (C) 1998-2013 by:
@@ -55,7 +55,7 @@ should be changed into "Device", and "Device" should be changed into
 Compatibility
 -------------
 
-Version 1.0.21 is compatible with 1.0pre8, 1.0 and later, but not with older
+Version 1.0.22 is compatible with 1.0pre8, 1.0 and later, but not with older
 versions of tinc.
 
 

diff --git a/configure.in b/configure.in
index 9fe39a3dd1699841d5c257793801ed510297fd68..af78ad81e353e2d1e0b1e339d653f1587e55d77b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.61)
 AC_INIT
 AC_CONFIG_SRCDIR([src/tincd.c])
-AM_INIT_AUTOMAKE(tinc, 1.0.21)
+AM_INIT_AUTOMAKE(tinc, 1.0.22)
 AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE