[tor-commits] [tor/master] fold in new change stanza

[arma at torproject.org]

commit ceb797c4b72130787b4462c6887abb924138248a
Author: Roger Dingledine <arma at torproject.org>
Date:   Tue Jan 15 11:54:52 2013 -0500

    fold in new change stanza
---
 ChangeLog       |   10 +++++++++-
 changes/bug7959 |    6 ------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index de97455..dc583f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
-Changes in version 0.2.4.9-alpha - 2013-01-??
+Changes in version 0.2.4.9-alpha - 2013-01-15
+  Tor 0.2.4.9-alpha provides a quick fix to make the new ntor handshake
+  work more robustly.
+
+  o Major bugfixes:
+    - Fix backward compatibility logic when receiving an embedded ntor
+      handshake tunneled in a CREATE cell. This clears up the "Bug:
+      couldn't format CREATED cell" warning. Fixes bug 7959; bugfix
+      on 0.2.4.8-alpha.
 
 
 Changes in version 0.2.4.8-alpha - 2013-01-14
diff --git a/changes/bug7959 b/changes/bug7959
deleted file mode 100644
index 80cd866..0000000
--- a/changes/bug7959
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major bugfixes:
-    - Fix backward compatibility logic when receiving an embedded ntor
-      handshake tunneled in a CREATE cell. This clears up the "Bug: couldn't
-      format CREATED cell" warning. Fix for bug 7959; bugfix on
-      0.2.4.8-alpha.
-