Releasing 1.0.31.

diff --git a/COPYING b/COPYING
index 513da315ade1d01536b8b7c54a0681033b7109d3..c7a4498a581efe8575bc82d8d3e35d269f347e20 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (C) 1998-2016 Ivo Timmermans, Guus Sliepen and others.
+Copyright (C) 1998-2017 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
 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 5c547d13938f88dc1c795783e7eb491932df2b56..34c6f1f5b5fc64c2a19647babeacf33c97afaf9d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Version 1.0.31               January 15 2017
+
+ * Remove ExecStop in tinc@.service.
+
+Thanks to Élie Bouttier for his contribution to this version of tinc.
+

 Version 1.0.30               October 30 2016
 
  * Fix troubles connecting to some HTTP proxies.
 Version 1.0.30               October 30 2016
 
  * Fix troubles connecting to some HTTP proxies.

diff --git a/README b/README
index b86063c1a5528788b8a709313cab6479d8e08c8d..3fb92fcc0a146d1edc4d18f7a222d19c2872c68f 100644 (file)
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
-This is the README file for tinc version 1.0.30. Installation
+This is the README file for tinc version 1.0.31. Installation

 instructions may be found in the INSTALL file.
 
 instructions may be found in the INSTALL file.
 

-tinc is Copyright (C) 1998-2016 by:
+tinc is Copyright (C) 1998-2017 by:

 
 Ivo Timmermans,
 Guus Sliepen <guus@tinc-vpn.org>,
 
 Ivo Timmermans,
 Guus Sliepen <guus@tinc-vpn.org>,


@@ -58,7 +58,7 @@ should be changed into "Device", and "Device" should be changed into
 Compatibility
 -------------
 
 Compatibility
 -------------
 

-Version 1.0.30 is compatible with 1.0pre8, 1.0 and later, but not with older
+Version 1.0.31 is compatible with 1.0pre8, 1.0 and later, but not with older

 versions of tinc. Note that since version 1.0.30, tinc requires all nodes in
 the VPN to be compiled with a version of LibreSSL or OpenSSL that supports the
 AES256 and SHA256 algorithms.
 versions of tinc. Note that since version 1.0.30, tinc requires all nodes in
 the VPN to be compiled with a version of LibreSSL or OpenSSL that supports the
 AES256 and SHA256 algorithms.

diff --git a/THANKS b/THANKS
index 4be771cddb2af28fabae1def616d09614fea174c..3446041bf5bfaa7ffaec146fe900ce10628951bb 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -15,6 +15,7 @@ We would like to thank the following people for their contributions to tinc:
 * David Pflug
 * Delf Eldkraft
 * dnk
 * David Pflug
 * Delf Eldkraft
 * dnk

+* Élie Bouttier

 * Enrique Zanardi
 * Florent Clairambault
 * Florian Weik
 * Enrique Zanardi
 * Florent Clairambault
 * Florian Weik

diff --git a/configure.ac b/configure.ac
index 0f31b01cab56e0f72f5f31c203709fdc1f62441d..4853da7fb5ab544951aeed3000b79e2fd7e095ab 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)

-AC_INIT([tinc], [1.0.30])
+AC_INIT([tinc], [1.0.31])

 AC_CONFIG_SRCDIR([src/tincd.c])
 AM_INIT_AUTOMAKE([1.11 check-news std-options subdir-objects nostdinc silent-rules -Wall])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/tincd.c])
 AM_INIT_AUTOMAKE([1.11 check-news std-options subdir-objects nostdinc silent-rules -Wall])
 AC_CONFIG_HEADERS([config.h])

diff --git a/src/tincd.c b/src/tincd.c
index aaf40e283a8bf5d045a18325d6193b560118bcfe..22fb726aaf88b61e733799195d5245b5247654a7 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
 /*
     tincd.c -- the main file for tincd
     Copyright (C) 1998-2005 Ivo Timmermans

-                  2000-2016 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2017 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>
                   2008      Max Rijevski <maksuf@gmail.com>
                   2009      Michael Tokarev <mjt@tls.msk.ru>
                   2010      Julien Muchembled <jm@jmuchemb.eu>


@@ -583,7 +583,7 @@ int main(int argc, char **argv) {
 
        if(show_version) {
                printf("%s version %s\n", PACKAGE, VERSION);
 
        if(show_version) {
                printf("%s version %s\n", PACKAGE, VERSION);

-               printf("Copyright (C) 1998-2016 Ivo Timmermans, Guus Sliepen and others.\n"
+               printf("Copyright (C) 1998-2017 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"
                                "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"