From: Guus Sliepen <guus@tinc-vpn.org>
Date: Mon, 22 Dec 2014 17:20:25 +0000 (+0100)
Subject: Releasing 1.0.25.
X-Git-Tag: release-1.0.25
X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=5de9d99b2cae088b2c093865a1ee11254bfdfd3c;p=tinc

Releasing 1.0.25.
---

diff --git a/COPYING b/COPYING
index f4dd0650..c3d1cebb 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (C) 1998-2013 Ivo Timmermans, Guus Sliepen and others.
+Copyright (C) 1998-2014 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 342fdff7..0a7f03ed 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,18 @@
+Version 1.0.25               December 22 2014
+
+ * Documentation updates.
+
+ * Support linking against -lresolv on Mac OS X.
+
+ * Fix scripts on Windows when using the ScriptsInterpreter option.
+
+ * Allow a minimum reconnect timeout to be specified.
+
+ * Support PriorityInheritance on IPv6 sockets.
+
+Thanks to David Pflug, Baptiste Jonglez, Alexis Hildebrandt, Borg, Jochen Voss,
+Tomislav Čohar and VittGam for their contributions to this version of tinc.
+
 Version 1.0.24               May 11 2014
 
  * Various compiler hardening flags are enabled by default.
diff --git a/README b/README
index 49fc1dc7..eeb3a3fb 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is the README file for tinc version 1.0.24. Installation
+This is the README file for tinc version 1.0.25. Installation
 instructions may be found in the INSTALL file.
 
 tinc is Copyright (C) 1998-2014 by:
@@ -55,7 +55,7 @@ should be changed into "Device", and "Device" should be changed into
 Compatibility
 -------------
 
-Version 1.0.24 is compatible with 1.0pre8, 1.0 and later, but not with older
+Version 1.0.25 is compatible with 1.0pre8, 1.0 and later, but not with older
 versions of tinc.
 
 
diff --git a/configure.ac b/configure.ac
index 85df11e6..402c794d 100644
--- 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)
-AC_INIT([tinc], [1.0.24])
+AC_INIT([tinc], [1.0.25])
 AC_CONFIG_SRCDIR([src/tincd.c])
 AM_INIT_AUTOMAKE([1.11 check-news std-options subdir-objects nostdinc -Wall])
 AC_CONFIG_HEADERS([config.h])