From f2ca4c13a65ea9252c814e4679f7b7448cb4d97d Mon Sep 17 00:00:00 2001
From: Yves Rutschle <git1@rutschle.net>
Date: Sat, 28 Sep 2013 21:38:33 +0200
Subject: [PATCH] ChangeLog entry for the branch

---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 5d4dbcb..3c1ff68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
 vNEXT:
+	Probes made more resilient, to incoming data
+	containing NULLs. Also made them behave properly
+	when receiving too short packets to probe on the
+	first incoming packet.
+	(Ondrej Kuzn�k)
+
 	Fixed bugs related to getpeername that would cause
 	sslh to quit erroneously (getpeername can return
 	actual errors if connections are dropped before