[tor-commits] [tor/release-0.2.5] fold in existing changes entry

[arma at torproject.org]

commit 22a82164b159ac157d133580bc06abdbd04f423a
Author: Roger Dingledine <arma at torproject.org>
Date:   Fri Sep 19 21:45:14 2014 -0400

    fold in existing changes entry
---
 ChangeLog               |   16 ++++++++++++++++
 changes/bug13151-client |   13 -------------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 424f208..e334c85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Changes in version 0.2.5.8-rc - 2014-09-2?
+  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
+      the wrong address, which would still work some of the time because
+      they also sent the identity digest of the rendezvous point, and if
+      the hidden service happened to try connecting to the rendezvous
+      point from a relay that already had a connection open to it,
+      the relay would reuse that connection. Now connections to hidden
+      services should be more robust and faster. Also, this bug meant
+      that clients were leaking to the hidden service whether they were
+      on a little-endian (common) or big-endian (rare) system, which for
+      some users might have reduced their anonymity. Fixes bug 13151;
+      bugfix on 0.2.1.5-alpha.
+
+
 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
   release series, and some long-standing bugs related to ORPort reachability
diff --git a/changes/bug13151-client b/changes/bug13151-client
deleted file mode 100644
index 1218dfd..0000000
--- a/changes/bug13151-client
+++ /dev/null
@@ -1,13 +0,0 @@
-  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
-      the wrong address, which would still work some of the time because
-      they also sent the identity digest of the rendezvous point, and if
-      the hidden service happened to try connecting to the rendezvous
-      point from a relay that already had a connection open to it,
-      the relay would reuse that connection. Now connections to hidden
-      services should be more robust and faster. Also, this bug meant
-      that clients were leaking to the hidden service whether they were
-      on a little-endian (common) or big-endian (rare) system, which for
-      some users might have reduced their anonymity. Fixes bug 13151;
-      bugfix on 0.2.1.5-alpha.