[tor-commits] [tor/master] Fold new entries into 0.4.6.1-alpha ChangeLog

[nickm@xxxxxxxxxxxxxx]

commit ded8f9b37882525f71a82e20a6b6c1b3ebb5d23e
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Mar 18 09:51:37 2021 -0400

    Fold new entries into 0.4.6.1-alpha ChangeLog
---
 ChangeLog            | 17 +++++++++++++++++
 changes/bug40222     |  6 ------
 changes/bug40285_045 |  4 ----
 changes/ticket40228  |  4 ----
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a9d8df1566..e4c0dc431e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,13 @@ Changes in version 0.4.6.1-alpha - 2021-03-18
       operator know why their relay hasn't been voted on. Closes ticket
       40255. Patch by Neel Chauhan.
 
+  o Major features (metrics):
+    - Relays now report how overloaded they are in their extra-info
+      documents. This information is controlled with the
+      OverloadStatistics torrc option, and it will be used to improve
+      decisions about the network's load balancing. Implements proposal
+      328; closes ticket 40222.
+
   o Major features (relay, denial of service):
     - Add a new DoS subsystem feature to control the rate of client
       connections for relays. Closes ticket 40253.
@@ -81,6 +88,11 @@ Changes in version 0.4.6.1-alpha - 2021-03-18
     - Add the stream ID argument to the event line in the ADDRMAP
       control event. Closes ticket 40249. Patch by Neel Chauhan.
 
+  o Minor features (dormant mode):
+    - Add a new 'DormantTimeoutEnabled' option to allow coarse-grained
+      control over whether the client ever becomes dormant from
+      inactivity. Most people won't need this. Closes ticket 40228.
+
   o Minor features (logging):
     - Change the DoS subsystem heartbeat line format so be more clear on
       what has been detected/rejected and which option is disabled if
@@ -120,6 +132,11 @@ Changes in version 0.4.6.1-alpha - 2021-03-18
       architectures in the future. Fixes bug 40274; bugfix
       on 0.2.5.1-alpha.
 
+  o Minor bugfixes (controller):
+    - Fix a "BUG" warning that would appear when a controller chooses
+      the first hop for a circuit, and that circuit completes. Fixes bug
+      40285; bugfix on 0.3.2.1-alpha.
+
   o Minor bugfixes (directory authorities, voting):
     - Add a new consensus method (31) to support any future changes that
       authorities decide to make to the value of bwweightscale or
diff --git a/changes/bug40222 b/changes/bug40222
deleted file mode 100644
index 8338ea4a7b..0000000000
--- a/changes/bug40222
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major features (metrics):
-    - Introduce a new class of extra-info statistics that allows relays to
-      expose details of how overloaded they are. This information is controlled
-      using the OverloadStatistics torrc option, and it will be used to make
-      more informed decisions about the network's load balancing. Implements
-      proposal 328; closes ticket 40222.
diff --git a/changes/bug40285_045 b/changes/bug40285_045
deleted file mode 100644
index db4f73cde0..0000000000
--- a/changes/bug40285_045
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (controller):
-    - Fix a "BUG" warning that would appear when a controller chooses the
-      first hop for a circuit, and that circuit completes.  Fixes
-      bug 40285; bugfix on 0.3.2.1-alpha.
diff --git a/changes/ticket40228 b/changes/ticket40228
deleted file mode 100644
index 297204decd..0000000000
--- a/changes/ticket40228
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (dormant mode):
-    - Add a new 'DormantTimeoutEnabled' option to allow coarse-grained
-      control over whether the client ever becomes dormant from inactivity.
-      Most people won't need this. Closes ticket 40228.

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits