[tor-commits] [tor/master] Whoops -- add an entry I missed to the 0.3.4.1-alpha changelog

[nickm at torproject.org]

commit 943291d7ae3d246c50fa55caa96c9bb04ee577eb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 17 12:47:06 2018 -0400

    Whoops -- add an entry I missed to the 0.3.4.1-alpha changelog
---
 ChangeLog        | 6 ++++++
 changes/bug26072 | 5 -----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 89b3f4c83..af7ae18f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -226,6 +226,12 @@ Changes in version 0.3.4.1-alpha - 2018-05-17
       counting bug when STREAM_BW events were enabled. Fixes bug 25400;
       bugfix on 0.2.5.2-alpha.
 
+  o Minor bugfixes (correctness, client):
+    - Upon receiving a malformed connected cell, stop processing the cell
+      immediately.  Previously we would mark the connection for close, but
+      continue processing the cell as if the connection were open. Fixes bug
+      26072; bugfix on 0.2.4.7-alpha.
+
   o Minor bugfixes (directory client):
     - When unverified-consensus is verified, rename it to cached-
       consenus. Fixes bug 4187; bugfix on 0.2.0.3-alpha.
diff --git a/changes/bug26072 b/changes/bug26072
deleted file mode 100644
index 2489e4fbb..000000000
--- a/changes/bug26072
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (correctness, client):
-    - Upon receiving a malformed connected cell, stop processing the cell
-      immediately.  Previously we would mark the connection for close, but
-      continue processing the cell as if the connection were open. Fixes bug
-      26072; bugfix on 0.2.4.7-alpha.