[tor-commits] [tor/release-0.4.2] fold two more changelog entries into 0423-alpha cl

[nickm at torproject.org]

commit a1b8ff682178cd98dfdb902db5d5fa8c21e7d224
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 23 20:24:03 2019 -0400

    fold two more changelog entries into 0423-alpha cl
---
 ChangeLog        | 13 +++++++++++++
 changes/bug32106 |  5 -----
 changes/bug32108 |  8 --------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 50931816b..d9f611b0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,15 @@ Changes in version 0.4.2.3-alpha - 2019-10-??
   This release fixes several bugs from the previous alpha release, and
   from earlier versions of Tor.
 
+  o Major bugfixes (relay):
+    - Relays now respect their AccountingMax bandwidth again. When
+      relays entered "soft" hibernation (which typically starts when
+      we've hit 90% of our AccountingMax), we had stopped checking
+      whether we should enter hard hibernation. Soft hibernation refuses
+      new connections and new circuits, but the existing circuits can
+      continue, meaning that relays could have exceeded their configured
+      AccountingMax. Fixes bug 32108; bugfix on 0.4.0.1-alpha.
+
   o Major bugfixes (v3 onion services):
     - Onion services now always use the exact number of intro points
       configured with the HiddenServiceNumIntroductionPoints option (or
@@ -93,6 +102,10 @@ Changes in version 0.4.2.3-alpha - 2019-10-??
   o Documentation:
     - Correct the description of "GuardLifetime". Fixes bug 31189;
       bugfix on 0.3.0.1-alpha.
+    - Make clear in the man page, in both the bandwidth section and the
+      accountingmax section, that Tor counts in powers of two, not
+      powers of ten: 1 GByte is 1024*1024*1024 bytes, not one billion
+      bytes. Resolves ticket 32106.
 
 
 Changes in version 0.4.2.2-alpha - 2019-10-07
diff --git a/changes/bug32106 b/changes/bug32106
deleted file mode 100644
index c6e8e9586..000000000
--- a/changes/bug32106
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor features (documentation):
-    - Make clear in the man page, in both the bandwidth section and the
-      accountingmax section, that Tor counts in powers of two, not
-      powers of ten: 1 GByte is 1024*1024*1024 bytes, not one billion
-      bytes. Resolves ticket 32106.
diff --git a/changes/bug32108 b/changes/bug32108
deleted file mode 100644
index 2806fa3e5..000000000
--- a/changes/bug32108
+++ /dev/null
@@ -1,8 +0,0 @@
-  o Major bugfixes (relay):
-    - Relays now respect their AccountingMax bandwidth again. When relays
-      entered "soft" hibernation (which typically starts when we've hit
-      90% of our AccountingMax), we had stopped checking whether we should
-      enter hard hibernation. Soft hibernation refuses new connections and
-      new circuits, but the existing circuits can continue, meaning that
-      relays could have exceeded their configured AccountingMax. Fixes
-      bug 32108; bugfix on 0.4.0.1-alpha.