[tor-commits] [tor/release-0.3.5] Fold in the 27471 changelog entry

[nickm at torproject.org]

commit a2ecc19ab923f34cc2363fa6f8c6e8d2bf9d350b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 16 09:01:17 2018 -0500

    Fold in the 27471 changelog entry
---
 ChangeLog           | 4 ++++
 changes/ticket27471 | 5 -----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2d1a08394..4c776f716 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -59,6 +59,10 @@ Changes in version 0.3.5.5-alpha - 2018-11-16
       whether to reuse the circuit or discard it. Previously, we closed
       intro circuits when sending NACKs. Fixes bug 27841; bugfix on
       0.3.2.1-alpha. Patch by Neel Chaunan.
+    - When replacing a descriptor in the client cache, make sure to
+      close all client introduction circuits for the old descriptor, so
+      we don't end up with unusable leftover circuits. Fixes bug 27471;
+      bugfix on 0.3.2.1-alpha.
 
 
 Changes in version 0.3.5.4-alpha - 2018-11-08
diff --git a/changes/ticket27471 b/changes/ticket27471
deleted file mode 100644
index ffe77d268..000000000
--- a/changes/ticket27471
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (hidden service v3, client):
-    - When replacing a descriptor in the client cache with a newer descriptor,
-      make sure to close all client introduction circuits of the old
-      descriptor so we don't end up with unusable leftover circuits. Fixes bug
-      27471; bugfix on 0.3.2.1-alpha.