[tor-commits] [tor/release-0.2.8] Fold 19271 into changelog

[nickm at torproject.org]

commit 79213afd3a31aefebdf7d3f4dfe0c3583a959c1f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 5 18:45:44 2016 -0400

    Fold 19271 into changelog
---
 ChangeLog     | 3 +++
 changes/19271 | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 06577e5..f6b5ef8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@ Changes in version 0.2.8.5-rc - 2016-07-0?
   0.2.8 release will be identical to it. It has a few small bugfixes
   against previous versions.
 
+  o Directory authority changes:
+    - Urras is no longer a directory authority. Closes ticket 19271.
+
   o Major bugfixes (heartbeat):
     - Fix regression that crashes Tor when disabling heartbeats. Fixes
       bug 19454; bugfix on tor-0.2.8.1-alpha. Reported by "kubaku".
diff --git a/changes/19271 b/changes/19271
deleted file mode 100644
index dc06ead..0000000
--- a/changes/19271
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Directory authority changes:
-    - Urras is no longer a directory authority. Closes ticket 19271.