Releasing 1.1pre7.

diff --git a/COPYING b/COPYING
index 85c729f1b956cfb051fb6176d440dc7e647affab..f4dd06501b6c930e3887a801be2f0532abb336b6 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (C) 1998-2012 Ivo Timmermans, Guus Sliepen and others.
+Copyright (C) 1998-2013 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 a6e13d8efded8491a4fc6de890d131f106aed6be..960b85cbd389890aa46769bf965f1fbb672e106d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+Version 1.1pre7              April 22 2013
+
+ * Fixed large latencies on Windows.
+
+ * Renamed the tincctl tool to tinc.
+
+ * Simplified changing the configuration using the tinc tool.
+
+ * Added a full description of the ExperimentalProtocol to the manual.
+
+ * Drop packets forwarded via TCP if they are too big (CVE-2013-1428).
+
+Thanks to Martin Schobert for auditing tinc and reporting the vulnerability.
+
 Version 1.1pre6              February 20 2013
 
  * Fixed tincd exitting immediately on Windows.

diff --git a/README b/README
index 1f534d084203dc62b9184c43a48b0de69aa11926..3267829f99c4d62d5f6d816dd7e43273a05d9ae9 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is the README file for tinc version 1.1pre6. Installation
+This is the README file for tinc version 1.1pre7. Installation
 instructions may be found in the INSTALL file.
 
 tinc is Copyright (C) 1998-2013 by:
@@ -36,11 +36,11 @@ at your own risk.
 Compatibility
 -------------
 
-Version 1.1pre6 is compatible with 1.0pre8, 1.0 and later, but not with older
+Version 1.1pre7 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.1pre6 itself, but not with any other 1.1preX version.
+1.0.X and 1.1pre7 itself, but not with any other 1.1preX version.
 
 
 Requirements

diff --git a/THANKS b/THANKS
index 1f2f73ce9a8fe7f4a67c54e1a0b40b02beb3b1ab..040f33d624125e3c1e116485c6c599bb5b0d77a4 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -30,6 +30,7 @@ We would like to thank the following people for their contributions to tinc:
 * Mark Glines
 * Markus Goetz
 * Martin Kihlgren
+* Martin Schobert
 * Martin Schürrer
 * Matias Carrasco
 * Max Rijevski

diff --git a/configure.in b/configure.in
index f2ec3bd68871df79dfc2d23fcb4567533be070a2..a59482a5e504215f06029b6b1c3d819756e959d0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ AC_PREREQ(2.61)
 AC_INIT
 AC_CONFIG_SRCDIR([src/tincd.c])
 AC_GNU_SOURCE
-AM_INIT_AUTOMAKE(tinc, 1.1pre6)
+AM_INIT_AUTOMAKE(tinc, 1.1pre7)
 AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE