Releasing 1.1pre12.

diff --git a/COPYING b/COPYING
index c3d1cebb467a75952e134320df9b19a209696348..513da315ade1d01536b8b7c54a0681033b7109d3 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (C) 1998-2014 Ivo Timmermans, Guus Sliepen and others.
+Copyright (C) 1998-2016 Ivo Timmermans, Guus Sliepen and others.
 See the AUTHORS file for a complete list.
 
 This program is free software; you can redistribute it and/or modify it under

diff --git a/NEWS b/NEWS
index 63295813ea6d2a4d17b33231732f2d26ed123a5d..bedca1c2d140802ea98684301536bf1e5946d358 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,31 @@
+# Version 1.1pre12             April 24 2016
+
+* Added a "--syslog" option to force logging to syslog even if running in the
+  foreground.
+* Fixes and improvements to the DecrementTTL function.
+* Improved PMTU discovery and UDP keepalive probes.
+* More efficient relaying of UDP packets through intermediate nodes.
+* Improved compatibility with newer TAP-Win32 drivers.
+* Added support for UPnP.
+* Allow tinc to be compiled without LibreSSL or OpenSSL (this drops
+  compatibility with nodes running 1.0.x).
+* Added a "fsck" command to check the configuration files for problems.
+* Tinc "start" now checks whether the daemon really started succesfully, and
+  displays error messages otherwise.
+* Added systemd service files.
+* Use the recvmmsg() function if available.
+* Support ToS/Diffserv on IPv6 connections.
+* Updated support for BSD tun/tap devices.
+* Added support for OS X utun interfaces.
+* Dropped support for Windows 2000.
+* Initial support for generating a tinc-up script from an invitation.
+* Many small fixes, documentation updates.
+
+Thanks to Etienne Dechamps, thorkill, Vittorio Gambaletta, Martin Weinelt,
+Sven-Haegar Koch, Florian Klink, LunnarShadow, Dato Simó, Jo-Philipp Wich,
+Jochen Voss, Nathan Stratton Treadway, Pierre Emeriaud, xentec, Samuel
+Thibault and Michael Tokarev for their contributions to this version of tinc.
+
 # Version 1.1pre11             December 27 2014
 
 * Added a "network" command to list or switch networks.

diff --git a/README b/README
index 102774ccb9e872e96257e0879e916c34bd5e8913..a44853a79fe0fea73788b76fef66fbb001b26454 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is the README file for tinc version 1.1pre11. Installation
+This is the README file for tinc version 1.1pre12. Installation
 instructions may be found in the INSTALL file.
 
 tinc is Copyright © 1998-2016 Ivo Timmermans, Guus Sliepen <guus@tinc-vpn.org>, and others.
@@ -32,11 +32,12 @@ at your own risk.
 Compatibility
 -------------
 
-Version 1.1pre11 is compatible with 1.0pre8, 1.0 and later, but not with older
+Version 1.1pre12 is compatible with 1.0pre8, 1.0 and later, but not with older
 versions of tinc.
 
 When the ExperimentalProtocol option is used, tinc is still compatible with
-1.0.X and 1.1pre11 itself, but not with any other 1.1preX version.
+1.0.X, 1.1pre11 and later, but not with any version between 1.1pre1 and
+1.1pre10.
 
 
 Requirements

diff --git a/THANKS b/THANKS
index dfb03659aeeba0c99fc303056d57d1409f6064e5..527cc61ddb3b5ac066d00911a16550891780a106 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -84,6 +84,7 @@ We would like to thank the following people for their contributions to tinc:
 * Sven-Haegar Koch
 * Teemu Kiviniemi
 * Thomas Tsiakalakis
+* thorkill
 * Timothy Redaelli
 * Tomasz Fortuna
 * Tomislav Čohar

diff --git a/src/tincd.c b/src/tincd.c
index 72bd8f3134b65cf3baee793449b885bee866dab3..4da9bd54c4ce97a539558d466f9d1ecf5f420a7c 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -1,7 +1,7 @@
 /*
     tincd.c -- the main file for tincd
     Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2015 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2016 Guus Sliepen <guus@tinc-vpn.org>
                   2008      Max Rijevski <maksuf@gmail.com>
                   2009      Michael Tokarev <mjt@tls.msk.ru>
                   2010      Julien Muchembled <jm@jmuchemb.eu>
@@ -346,7 +346,7 @@ int main(int argc, char **argv) {
        if(show_version) {
                printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE,
                           BUILD_VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR);
-               printf("Copyright (C) 1998-2015 Ivo Timmermans, Guus Sliepen and others.\n"
+               printf("Copyright (C) 1998-2016 Ivo Timmermans, Guus Sliepen and others.\n"
                                "See the AUTHORS file for a complete list.\n\n"
                                "tinc comes with ABSOLUTELY NO WARRANTY.  This is free software,\n"
                                "and you are welcome to redistribute it under certain conditions;\n"