From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 19 Feb 2015 16:36:27 +0000 (-0500)
Subject: fold one more entry into the changelog
X-Git-Tag: tor-0.2.6.3-alpha~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7b03e9a8c7ca88b0d0fcc4ef49c53c1809b425ef;p=thirdparty%2Ftor.git

fold one more entry into the changelog
---

diff --git a/ChangeLog b/ChangeLog
index 79c9779283..3909274b2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -238,6 +238,8 @@ Changes in version 0.2.6.3-alpha - 2015-02-2?
     - Do not attempt to download extrainfo documents which we will be
       unable to validate with a matching server descriptor. Fixes bug
       13762; bugfix on 0.2.0.1-alpha.
+    - Fix a bug that was truncating AUTHDIR_NEWDESC events sent to the
+      control port. Fixes bug 14953; bugfix on 0.2.0.1-alpha.
     - Enlarge the buffer to read bwauth generated files to avoid an
       issue when parsing the file in dirserv_read_measured_bandwidths().
       Fixes bug 14125; bugfix on 0.2.2.1-alpha.
diff --git a/changes/bug14953 b/changes/bug14953
deleted file mode 100644
index 0fb0a64e29..0000000000
--- a/changes/bug14953
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (directory authority):
-    - Fix a bug that was truncating AUTHDIR_NEWDESC events sent to the
-      control port. Fixes bug 14953; bugfix on 0.2.0.1-alpha.