Releasing 1.0.20.

diff --git a/Makefile.am b/Makefile.am
index b13689a..4ef1181 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ SUBDIRS =  m4 lib src doc
 
 ACLOCAL_AMFLAGS = -I m4 
 
-EXTRA_DIST = have.h system.h COPYING.README
+EXTRA_DIST = have.h system.h COPYING.README README.android
 
 ChangeLog:
        git log > ChangeLog

diff --git a/NEWS b/NEWS
index 4887ee4..44a8eec 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,24 @@
+Version 1.0.20               March 03 2013
+
+ * Use /dev/tap0 by default on FreeBSD and NetBSD when using switch mode.
+
+ * Minor improvements and clarifications in the documentation.
+
+ * Allow tinc to be cross-compiled with Android's NDK.
+
+ * The discovered PMTU is now also applied to VLAN tagged traffic.
+
+ * The LocalDiscovery option now makes use of all addresses tinc is bound to.
+
+ * Fixed support for tunemu on iOS devices.
+
+ * The PriorityInheritance option now also works with switch mode.
+
+ * Fixed tinc crashing when using a SOCKS5 proxy.
+
+Thanks to Mesar Hameed, Vilbrekin and Martin Schürrer for their contributions
+to this version of tinc.
+
 Version 1.0.19               June 25 2012
 
  * Allow :: notation in IPv6 Subnets.
@@ -9,6 +30,9 @@ Version 1.0.19               June 25 2012
  * Add basic support for SOCKS proxies, HTTP proxies, and proxying through an
    external command.
 
+Thanks to Anthony G. Basile and Michael Tokarev for their contributions to
+this version of tinc.
+
 Version 1.0.18               March 25 2012
 
  * Fixed IPv6 in switch mode by turning off DecrementTTL by default.
@@ -35,6 +59,8 @@ Version 1.0.17               March 10 2012
  * Disabling old RSA keys when generating new ones now also works properly on
    Windows.
 
+Thanks to Nick Hibma for his contribution to this version of tinc.
+
 Version 1.0.16               July 23 2011
 
  * Fixed a performance issue with TCP communication under Windows.

diff --git a/README b/README
index 346eb4f..3ef3e86 100644 (file)
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
-This is the README file for tinc version 1.0.19. Installation
+This is the README file for tinc version 1.0.20. Installation
 instructions may be found in the INSTALL file.
 
-tinc is Copyright (C) 1998-2012 by:
+tinc is Copyright (C) 1998-2013 by:
 
 Ivo Timmermans,
 Guus Sliepen <guus@tinc-vpn.org>,
@@ -36,8 +36,8 @@ writeup describing various security issues in several VPN daemons. He showed
 that tinc lacks perfect forward security, the connection authentication could
 be done more properly, that the sequence number we use as an IV is not the best
 practice and that the default length of the HMAC for packets is too short in
-his opinion. We do not know of a way to exploit these weaknesses, but we will
-address these issues in tinc 2.0.
+his opinion. We do not know of a way to exploit these weaknesses, but these
+issues are being addressed in the tinc 1.1 branch.
 
 Cryptography is a hard thing to get right. We cannot make any
 guarantees. Time, review and feedback are the only things that can
@@ -55,7 +55,7 @@ should be changed into "Device", and "Device" should be changed into
 Compatibility
 -------------
 
-Version 1.0.19 is compatible with 1.0pre8, 1.0 and later, but not with older
+Version 1.0.20 is compatible with 1.0pre8, 1.0 and later, but not with older
 versions of tinc.
 
 

diff --git a/THANKS b/THANKS
index 42b1c0a..8988785 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -7,6 +7,7 @@ We would like to thank the following people for their contributions to tinc:
 * Armijn Hemel
 * Brandon Black
 * Cris van Pelt
+* Darius Jahandarie
 * Delf Eldkraft
 * dnk
 * Enrique Zanardi
@@ -17,6 +18,7 @@ We would like to thank the following people for their contributions to tinc:
 * James MacLean
 * Jamie Briggs
 * Jason Harper
+* Jelle de Jong
 * Jeroen Ubbink
 * Jerome Etienne
 * Julien Muchembled

diff --git a/configure.in b/configure.in
index ee4da11..15b4309 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.19)
+AM_INIT_AUTOMAKE(tinc, 1.0.20)
 AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
 

diff --git a/doc/tinc.texi b/doc/tinc.texi
index 70f3659..a8afc06 100644 (file)
--- a/doc/tinc.texi
+++ b/doc/tinc.texi
@@ -15,7 +15,7 @@
 
 This is the info manual for @value{PACKAGE} version @value{VERSION}, a Virtual Private Network daemon.
 
-Copyright @copyright{} 1998-2012 Ivo Timmermans,
+Copyright @copyright{} 1998-2013 Ivo Timmermans,
 Guus Sliepen <guus@@tinc-vpn.org> and
 Wessel Dankers <wsl@@tinc-vpn.org>.
 
@@ -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-2012 Ivo Timmermans,
+Copyright @copyright{} 1998-2013 Ivo Timmermans,
 Guus Sliepen <guus@@tinc-vpn.org> and
 Wessel Dankers <wsl@@tinc-vpn.org>.
 

diff --git a/src/graph.c b/src/graph.c
index cca0935..203942d 100644 (file)
--- a/src/graph.c
+++ b/src/graph.c
@@ -1,6 +1,6 @@
 /*
     graph.c -- graph algorithms
-    Copyright (C) 2001-2012 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2001-2013 Guus Sliepen <guus@tinc-vpn.org>,
                   2001-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify

diff --git a/src/net_packet.c b/src/net_packet.c
index c209248..1efc60d 100644 (file)
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -1,7 +1,7 @@
 /*
     net_packet.c -- Handles in- and outgoing VPN packets
     Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
                   2010      Timothy Redaelli <timothy@redaelli.eu>
                   2010      Brandon Black <blblack@gmail.com>
 

diff --git a/src/protocol.c b/src/protocol.c
index 9ef9082..b385fbc 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -1,7 +1,7 @@
 /*
     protocol.c -- handle the meta-protocol, basic functions
     Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index 5ae99e8..a7a6fe0 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -1,7 +1,7 @@
 /*
     protocol_auth.c -- handle the meta-protocol, authentication
     Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by