From 40b1f62fba2f5612fb7b256c318f875050a9e12b Mon Sep 17 00:00:00 2001
From: Guus Sliepen <guus@tinc-vpn.org>
Date: Wed, 5 Dec 2012 22:52:01 +0100
Subject: [PATCH] Releasing 1.1pre4.

---
 download.mdwn             | 23 +++++++++++++++++------
 index.mdwn                |  2 +-
 news/release-1.1pre4.mdwn | 16 ++++++++++++++++
 3 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 news/release-1.1pre4.mdwn

diff --git a/download.mdwn b/download.mdwn
index 998d726..cf39377 100644
--- a/download.mdwn
+++ b/download.mdwn
@@ -25,15 +25,15 @@ packages you should contact its maintainer.
 
 ### Latest pre-release from the 1.1 branch
 
-[[!inline  pages="news/release-1.1pre3" template=newsitemnoheader feeds="no"]]
+[[!inline  pages="news/release-1.1pre4" template=newsitemnoheader feeds="no"]]
 
-<a name="1.1pre3"></a><table>
-<tr><td>**Version**<td>1.1pre3
+<a name="1.1pre4"></a><table>
+<tr><td>**Version**<td>1.1pre4
 <tr><td>**Source**<td>
-[tinc-1.1pre3.tar.gz](/packages/tinc-1.1pre3.tar.gz)
-([sig](/packages/tinc-1.1pre3.tar.gz.sig))
+[tinc-1.1pre4.tar.gz](/packages/tinc-1.1pre4.tar.gz)
+([sig](/packages/tinc-1.1pre4.tar.gz.sig))
 <tr><td>**Packages**<td>
-[Windows XP/Vista/7](/packages/windows/tinc-1.1pre3-install.exe)
+[Windows XP/Vista/7](/packages/windows/tinc-1.1pre4-install.exe)
 </table>
 
 ### Distributions providing tinc
@@ -63,6 +63,17 @@ using one of these packages.
 
 ### Older versions
 
+<a name="1.1pre3"></a><table>
+<tr><td>**Version**<td>1.1pre3
+<tr><td>**Source**<td>
+[tinc-1.1pre3.tar.gz](/packages/tinc-1.1pre3.tar.gz)
+([sig](/packages/tinc-1.1pre3.tar.gz.sig))
+<tr><td>**Packages**<td>
+[Windows XP/Vista/7](/packages/windows/tinc-1.1pre3-install.exe)
+<tr><td>**Remarks**<td>
+The Windows binary fails to read packets from the TAP adapter.
+</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 825f836..1d3eb62 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -2,7 +2,7 @@
 
 ### Latest stable version: [[1.0.19|download]]
 
-Latest prerelease from the 1.1 branch: [[1.1pre3|download]]
+Latest prerelease from the 1.1 branch: [[1.1pre4|download]]
 
 ### Latest news:
 
diff --git a/news/release-1.1pre4.mdwn b/news/release-1.1pre4.mdwn
new file mode 100644
index 0000000..2c4468a
--- /dev/null
+++ b/news/release-1.1pre4.mdwn
@@ -0,0 +1,16 @@
+[[!meta author="guus"]]
+[[!meta date="December 5th 2012"]]
+
+Version 1.1pre4 released.
+
+ * Added the "AutoConnect" option which will let tinc automatically select
+   which nodes to connect to.
+
+ * Improved performance of VLAN-tagged IP traffic inside the VPN.
+
+ * Ensured LocalDiscovery works with multiple BindToAddress statements and/or
+   IPv6-only LANs.
+
+ * Dropped dependency on libevent.
+
+ * Fixed Windows version not reading packets from the TAP adapter.
-- 
2.20.1