From c6c24e5ccda870223333c5da3aa8b8931030f004 Mon Sep 17 00:00:00 2001
From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sun, 5 Jul 2015 16:37:58 +0200
Subject: [PATCH] Releasing 1.0.26.

---
 docs.mdwn                |  2 +-
 download.mdwn            | 21 +++++++++++++++------
 index.mdwn               |  2 +-
 news/release-1.0.26.mdwn | 10 ++++++++++
 4 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 news/release-1.0.26.mdwn

diff --git a/docs.mdwn b/docs.mdwn
index c9754c9..fe0418f 100644
--- a/docs.mdwn
+++ b/docs.mdwn
@@ -15,7 +15,7 @@ something else than the documentation says, please tell us!
 The main source of information is the manual. This text describes how to set
 up a VPN using tinc. It also contains a chapter with more technical details,
 which you may want to read, as well as the ideas behind tinc. This manual is
-currently up to date with version 1.0.25.
+currently up to date with version 1.0.26.
 
 - [manual (HTML)](/documentation/)
 - [manual (PDF)](/documentation/tinc.pdf)
diff --git a/download.mdwn b/download.mdwn
index ed1ca0d..95091bf 100644
--- a/download.mdwn
+++ b/download.mdwn
@@ -12,15 +12,15 @@ packages you should contact its maintainer.
 
 ### Latest stable release
 
-[[!inline  pages="news/release-1.0.25" template=newsitemnoheader feeds="no"]]
+[[!inline  pages="news/release-1.0.26" template=newsitemnoheader feeds="no"]]
 
-<a name="1.0.25"></a><table>
-<tr><td>**Version**<td>1.0.25
+<a name="1.0.26"></a><table>
+<tr><td>**Version**<td>1.0.26
 <tr><td>**Source**<td>
-[tinc-1.0.25.tar.gz](/packages/tinc-1.0.25.tar.gz)
-([sig](/packages/tinc-1.0.25.tar.gz.sig))
+[tinc-1.0.26.tar.gz](/packages/tinc-1.0.26.tar.gz)
+([sig](/packages/tinc-1.0.26.tar.gz.sig))
 <tr><td>**Packages**<td>
-[Windows XP/Vista/7/8](/packages/windows/tinc-1.0.25-install.exe)
+[Windows XP/Vista/7/8](/packages/windows/tinc-1.0.26-install.exe)
 </table>
 
 ### Latest pre-release from the 1.1 branch
@@ -65,6 +65,15 @@ using one of these packages.
 
 ### Older versions
 
+<a name="1.0.25"></a><table>
+<tr><td>**Version**<td>1.0.25
+<tr><td>**Source**<td>
+[tinc-1.0.25.tar.gz](/packages/tinc-1.0.25.tar.gz)
+([sig](/packages/tinc-1.0.25.tar.gz.sig))
+<tr><td>**Packages**<td>
+[Windows XP/Vista/7/8](/packages/windows/tinc-1.0.25-install.exe)
+</table>
+
 <a name="1.1pre10"></a><table>
 <tr><td>**Version**<td>1.1pre10
 <tr><td>**Source**<td>
diff --git a/index.mdwn b/index.mdwn
index 8acf4d1..e8a9060 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,6 +1,6 @@
 # Welcome to tinc!
 
-### Latest stable version: [[1.0.25|download]]
+### Latest stable version: [[1.0.26|download]]
 
 Latest prerelease from the 1.1 branch: [[1.1pre11|download]]
 
diff --git a/news/release-1.0.26.mdwn b/news/release-1.0.26.mdwn
new file mode 100644
index 0000000..ecc2a93
--- /dev/null
+++ b/news/release-1.0.26.mdwn
@@ -0,0 +1,10 @@
+[[!meta author="guus"]]
+[[!meta date="July 5th 2015"]]
+
+Version 1.0.26 released.
+
+* Tinc now forces glibc to reload /etc/resolv.conf for every hostname lookup.
+* Fixed --logfile without a filename on Windows.
+* Ensure tinc can be compiled when using musl libc.
+
+Thanks to Jo-Philipp Wich for his contribution to this version of tinc.
-- 
2.20.1