From 323b7a15ee7131102ceb14cc5a5e24a78313746c Mon Sep 17 00:00:00 2001
From: Roger Dingledine <arma@torproject.org>
Date: Sun, 7 Aug 2005 20:15:32 +0000
Subject: [PATCH] and forward-port the 0.1.0.14 changelog

svn:r4734
---
 ChangeLog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 1604d3f455..7d59c6eaff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -107,6 +107,13 @@ Changes in version 0.1.1.1-alpha - 2005-06-29
       test this?
 
 
+Changes in version 0.1.0.14 - 2005-08-08
+  o Bugfixes on 0.1.0.x:
+      - Fix the other half of the bug with crypto handshakes.
+      - Fix an assert trigger if you send a 'signal term' via the
+        controller when it's listening for 'event info' messages.
+
+
 Changes in version 0.1.0.13 - 2005-08-04
   o Bugfixes on 0.1.0.x:
     - Fix a critical bug in the security of our crypto handshakes.