[tor-commits] [tor/release-0.2.5] Another entry for the 0.2.5.11 changelog

[nickm at torproject.org]

commit 8ba0ea441940f42e192066bc081f3e637b99d2d2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 12 12:53:06 2015 -0400

    Another entry for the 0.2.5.11 changelog
---
 ChangeLog        |    5 +++++
 changes/bug15205 |    5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index caf1f4d..c3fa504 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,11 @@ Changes in version 0.2.5.11 - 2015-03-??
     - The directory authority Faravahar has a new IP address. This
       closes ticket 14487.
 
+  o Major bugfixes (crash, OSX, security):
+    - Fix a remote denial-of-service opportunity caused by a bug in
+      OSX's _strlcat_chk() function. Fixes bug 15205; bug first appeared
+      in OSX 10.9.
+
   o Major bugfixes (relay, stability, possible security):
     - Fix a bug that could lead to a relay crashing with an assertion
       failure if a buffer of exactly the wrong layout was passed to
diff --git a/changes/bug15205 b/changes/bug15205
deleted file mode 100644
index 0cb9f3f..0000000
--- a/changes/bug15205
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes (crash, OSX, security):
-    - Fix a remote denial-of-service opportunity caused by a bug
-      in OSX's _strlcat_chk() function. Fixes bug 15205; bug first
-      appeared in OSX 10.9. 
-