From 28a1501b9a8b4c730f7f965d6b2e8fc50feba261 Mon Sep 17 00:00:00 2001
From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sat, 10 Mar 2012 13:31:36 +0100
Subject: [PATCH] Releasing 1.0.17.

---
 NEWS          | 17 +++++++++++++++++
 README        |  6 +++---
 configure.in  |  2 +-
 doc/tinc.texi |  2 +-
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index ab36c237..6e9a1000 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,20 @@
+Version 1.0.17               March 10 2012
+
+ * The DeviceType option can now be used to select dummy, raw socket, UML and
+   VDE devices without needing to recompile tinc.
+
+ * Allow multiple BindToAddress statements.
+
+ * Decrement TTL value of IPv4 and IPv6 packets.
+
+ * Add LocalDiscovery option allowing tinc to detect peers that are behind the
+   same NAT.
+
+ * Accept Subnets passed with the -o option when StrictSubnets = yes.
+
+ * Disabling old RSA keys when generating new ones now also works properly on
+   Windows.
+
 Version 1.0.16               July 23 2011
 
  * Fixed a performance issue with TCP communication under Windows.
diff --git a/README b/README
index 338f23c9..3c23b066 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
-This is the README file for tinc version 1.0.16. Installation
+This is the README file for tinc version 1.0.17. Installation
 instructions may be found in the INSTALL file.
 
-tinc is Copyright (C) 1998-2011 by:
+tinc is Copyright (C) 1998-2012 by:
 
 Ivo Timmermans,
 Guus Sliepen <guus@tinc-vpn.org>,
@@ -55,7 +55,7 @@ should be changed into "Device", and "Device" should be changed into
 Compatibility
 -------------
 
-Version 1.0.16 is compatible with 1.0pre8, 1.0 and later, but not with older
+Version 1.0.17 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 4d6a9493..5ff4a3e7 100644
--- 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.16)
+AM_INIT_AUTOMAKE(tinc, 1.0.17)
 AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
 
diff --git a/doc/tinc.texi b/doc/tinc.texi
index 0868038a..aedde3f8 100644
--- a/doc/tinc.texi
+++ b/doc/tinc.texi
@@ -39,7 +39,7 @@ permission notice identical to this one.
 @vskip 0pt plus 1filll
 This is the info manual for @value{PACKAGE} version @value{VERSION}, a Virtual Private Network daemon.
 
-Copyright @copyright{} 1998-2011 Ivo Timmermans,
+Copyright @copyright{} 1998-2012 Ivo Timmermans,
 Guus Sliepen <guus@@tinc-vpn.org> and
 Wessel Dankers <wsl@@tinc-vpn.org>.
 
-- 
2.39.5