[tor-commits] [tor/release-0.2.5] merge in the next changes entry

[arma at torproject.org]

commit 9fe73959847ab5caa6b723fb5567882604a31765
Author: Roger Dingledine <arma at torproject.org>
Date:   Sat Sep 20 17:11:43 2014 -0400

    merge in the next changes entry
---
 ChangeLog        |    8 ++++++++
 changes/bug13100 |    3 ---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e334c85..739e342 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
 Changes in version 0.2.5.8-rc - 2014-09-2?
+  Tor 0.2.5.8-rc is the second release candidate for the Tor 0.2.5.x
+  series. It fixes a bug that affects consistency and speed when
+  connecting to hidden services, and it updates the location of one of
+  the directory authorities.
+
   o Major bugfixes:
     - Clients now send the correct address for their chosen rendezvous
       point when trying to access a hidden service. They used to send
@@ -13,6 +18,9 @@ Changes in version 0.2.5.8-rc - 2014-09-2?
       some users might have reduced their anonymity. Fixes bug 13151;
       bugfix on 0.2.1.5-alpha.
 
+  o Directory authority changes:
+    - Change IP address for gabelmoo (v3 directory authority).
+
 
 Changes in version 0.2.5.7-rc - 2014-09-11
   Tor 0.2.5.7-rc fixes several regressions from earlier in the 0.2.5.x
diff --git a/changes/bug13100 b/changes/bug13100
deleted file mode 100644
index bbe43e6..0000000
--- a/changes/bug13100
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Directory authority changes:
-    - Change IP address for gabelmoo (v3 directory authority).
-