Tweak changelog more.

diff --git a/ChangeLog b/ChangeLog
index 1397382ab24fd78c0f33d67a7935f2b251c43b62..be315111a96e634f49e247f60e67e5b8c8808711 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.2.7.1-alpha - 2015-05-??
+Changes in version 0.2.7.1-alpha - 2015-05-1?
   Tor 0.2.7.1-alpha is the first alpha release in its series.
 
   o New system requirements:
@@ -128,6 +128,9 @@ Changes in version 0.2.7.1-alpha - 2015-05-??
       and 0.2.0.10.
 
   o Minor bugfixes (hidden service):
+    - Fix an out-of-bounds read when parsing invalid INTRODUCE2 cells
+      on a client authorized hidden service. Fixes bug 15823; bugfix
+      on 0.2.1.6-alpha.
     - Remove an extraneous newline character from the end of hidden
       service descriptors. Fixes bug 15296; bugfix on 0.2.0.10-alpha.
 

diff --git a/changes/bug15823 b/changes/bug15823
deleted file mode 100644 (file)
index 987de5d..0000000
--- a/changes/bug15823
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (hidden service):
-    - Fix an out-of-bounds read when parsing invalid INTRODUCE2 cells
-      on a client authorized hidden service. Fixes bug 15823; bugfix
-      on 0.2.1.6-alpha.