[tor-commits] [tor/master] Fold in the entry for 28089

[nickm at torproject.org]

commit 498a852bba149975f7fe50180bfb24077dcdc4c4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 17 13:12:24 2018 -0400

    Fold in the entry for 28089
---
 ChangeLog           | 7 +++++++
 changes/ticket28089 | 6 ------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ca9729c00..73fcee495 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,13 @@ Changes in version 0.3.5.3-alpha - 2018-10-17
   versions. It's still an alpha, but we hope it's getting closer and
   closer to stability.
 
+  o Major bugfixes (relay):
+    - When our write bandwidth limit is exhausted, stop writing on the
+      connection. Previously, we had a typo in the code that would make us
+      stop reading instead, leading to relay connections being stuck
+      indefinitely and consuming kernel RAM. Fixes bug 28089; bugfix on
+      0.3.4.1-alpha.
+
   o Major bugfixes (compilation):
     - Fix compilation on ARM (and other less-used CPUs) when compiling
       with OpenSSL before 1.1. Fixes bug 27781; bugfix on 0.3.4.1-alpha.
diff --git a/changes/ticket28089 b/changes/ticket28089
deleted file mode 100644
index a900ec18f..000000000
--- a/changes/ticket28089
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major bugfixes (relay):
-    - When our write bandwidth limit is exhausted, stop writing on the
-      connection. Previously, we had a typo in the code that would make us stop
-      reading leading to relay connections being stuck indefinitely. Fixes bug
-      28089; bugfix on 0.3.4.1-alpha.
-