[tor-commits] [tor/release-0.4.5] Fold last entry into changelog

[nickm at torproject.org]

commit e5c47d295bd3dc35f75c7d5c1753c650fd912640
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 12 11:22:35 2021 -0500

    Fold last entry into changelog
---
 ChangeLog           | 19 +++++++++++++------
 changes/ticket40237 |  5 -----
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9b3f0918ec..ba74ca0fb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,13 @@ Changes in version 0.4.5.3-rc - 2021-01-12
   be fairly simple. There will be at least one more release candidate
   before 0.4.5.x is stable.
 
+  o Major bugfixes (onion service v3):
+    - Stop requiring a live consensus for v3 clients and services, and
+      allow a "reasonably live" consensus instead. This allows v3 onion
+      services to work even if the authorities fail to generate a
+      consensus for more than 2 hours in a row. Fixes bug 40237; bugfix
+      on 0.3.5.1-alpha.
+
   o Minor features (crypto):
     - Fix undefined behavior on our Keccak library. The bug only
       appeared on platforms with 32-byte CPU cache lines (e.g. armv5tel)
@@ -16,9 +23,9 @@ Changes in version 0.4.5.3-rc - 2021-01-12
       weasel for diagnosing this.
 
   o Minor features (documentation):
-    - Mention the "!badexit" directive that can appear in an
-      authority's approved-routers file, and update the description of
-      the "!invalid" directive. Closes ticket 40188.
+    - Mention the "!badexit" directive that can appear in an authority's
+      approved-routers file, and update the description of the
+      "!invalid" directive. Closes ticket 40188.
 
   o Minor bugfixes (compilation):
     - Fix a compilation warning about unreachable fallthrough
@@ -30,9 +37,9 @@ Changes in version 0.4.5.3-rc - 2021-01-12
 
   o Minor bugfixes (config, bridge):
     - Really fix the case where torrc has a missing ClientTransportPlugin
-      but is configured with a Bridge line and UseBridges. Previously, we
-      didn't look at the managed proxy list and thus would fail for the
-      "exec" case. Fixes bug 40106; bugfix on 0.4.5.1-alpha.
+      but is configured with a Bridge line and UseBridges. Previously,
+      we didn't look at the managed proxy list and thus would fail for
+      the "exec" case. Fixes bug 40106; bugfix on 0.4.5.1-alpha.
 
   o Minor bugfixes (logging, relay):
     - Log our address as reported by the directory authorities, if none
diff --git a/changes/ticket40237 b/changes/ticket40237
deleted file mode 100644
index fc32f59cd4..0000000000
--- a/changes/ticket40237
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes (onion service v3):
-    - Stop requiring a live consensus for v3 clients and services to work. The
-      use of a reasonably live consensus will allow v3 to work properly in most
-      cases if the network failed to generate a consensus for more than 2 hours
-      in a row. Fixes bug 40237; bugfix on 0.3.5.1-alpha.