From feac0b31410e1fcdf194218201988ace96fba8ee Mon Sep 17 00:00:00 2001
From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sun, 3 Mar 2013 21:19:33 +0100
Subject: [PATCH] Releasing 1.0.20.

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

diff --git a/docs.mdwn b/docs.mdwn
index 8426b5b..601c7da 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.19.
+currently up to date with version 1.0.20.
 
 - [manual (HTML)](/documentation/tinc_toc)
 - [manual (PDF)](/documentation/tinc.pdf)
diff --git a/download.mdwn b/download.mdwn
index cf5d597..ef69fe0 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.19" template=newsitemnoheader feeds="no"]]
+[[!inline  pages="news/release-1.0.20" template=newsitemnoheader feeds="no"]]
 
-<a name="1.0.19"></a><table>
-<tr><td>**Version**<td>1.0.19
+<a name="1.0.20"></a><table>
+<tr><td>**Version**<td>1.0.20
 <tr><td>**Source**<td>
-[tinc-1.0.19.tar.gz](/packages/tinc-1.0.19.tar.gz)
-([sig](/packages/tinc-1.0.19.tar.gz.sig))
+[tinc-1.0.20.tar.gz](/packages/tinc-1.0.20.tar.gz)
+([sig](/packages/tinc-1.0.20.tar.gz.sig))
 <tr><td>**Packages**<td>
-[Windows XP/Vista/7/8](/packages/windows/tinc-1.0.19-install.exe)
+[Windows XP/Vista/7/8](/packages/windows/tinc-1.0.20-install.exe)
 </table>
 
 ### Latest pre-release from the 1.1 branch
@@ -93,6 +93,15 @@ using one of these packages.
 The Windows binary fails to read packets from the TAP adapter.
 </table>
 
+<a name="1.0.19"></a><table>
+<tr><td>**Version**<td>1.0.19
+<tr><td>**Source**<td>
+[tinc-1.0.19.tar.gz](/packages/tinc-1.0.19.tar.gz)
+([sig](/packages/tinc-1.0.19.tar.gz.sig))
+<tr><td>**Packages**<td>
+[Windows XP/Vista/7/8](/packages/windows/tinc-1.0.19-install.exe)
+</table>
+
 <a name="1.0.18"></a><table>
 <tr><td>**Version**<td>1.0.18
 <tr><td>**Source**<td>
diff --git a/index.mdwn b/index.mdwn
index 141677b..00dd7dd 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,6 +1,6 @@
 # Welcome to tinc!
 
-### Latest stable version: [[1.0.19|download]]
+### Latest stable version: [[1.0.20|download]]
 
 Latest prerelease from the 1.1 branch: [[1.1pre6|download]]
 
diff --git a/news/release-1.0.20.mdwn b/news/release-1.0.20.mdwn
new file mode 100644
index 0000000..4923283
--- /dev/null
+++ b/news/release-1.0.20.mdwn
@@ -0,0 +1,16 @@
+[[!meta author="guus"]]
+[[!meta date="March 3rd 2013"]]
+
+Version 1.0.20 released.
+
+ * Use /dev/tap0 by default on FreeBSD and NetBSD when using switch mode.
+ * Minor improvements and clarifications in the documentation.
+ * Allow tinc to be cross-compiled with Android's NDK.
+ * The discovered PMTU is now also applied to VLAN tagged traffic.
+ * The LocalDiscovery option now makes use of all addresses tinc is bound to.
+ * Fixed support for tunemu on iOS devices.
+ * The PriorityInheritance option now also works with switch mode.
+ * Fixed tinc crashing when using a SOCKS5 proxy.
+
+Thanks to Mesar Hameed, Vilbrekin and Martin Schürrer for their contributions
+to this version of tinc.
-- 
2.20.1