release: ChangeLog/ReleaseNotes fixes

Signed-off-by: David Goulet <dgoulet@torproject.org>

2 files changed, 44 insertions, 32 deletions

diff --git a/ChangeLog b/ChangeLog
index 36461babc9..aadc8220fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,20 @@
-INSERT SUMMARY BLURP
-
 Changes in version 0.4.6.11 - 2022-08-11
+  This version contains two major fixes aimed at reducing memory pressure on
+  relays and possible side-channel. The rest of the fixes were backported for
+  stability or safety purposes.
+
+  This is the very LAST version of this series. As of August 1st 2022, it is
+  end-of-life (EOL). We thus strongly recommend to upgrade to the latest
+  stable of the 0.4.7.x series.
+
   o Major bugfixes (relay):
-    - Remove OR connections btrack subsystem entries when the
-      connections closes normally. Before this, we would only close it
-      on error and thus leaking memory for each normal OR connections.
-      Fixes bug 40604; bugfix on 0.4.0.1-alpha.
-    - Stop sending TRUNCATED cell and instead close the circuits which
-      sends a DESTROY cell so every relay in the circuit path can stop
-      queuing cells. Fixes bug 40623; bugfix on 0.1.0.2-rc.
+    - Remove OR connections btrack subsystem entries when the connections
+      close normally. Before this, we would only remove the entry on error and
+      thus leaking memory for each normal OR connections. Fixes bug 40604;
+      bugfix on 0.4.0.1-alpha.
+    - Stop sending TRUNCATED cell and instead close the circuit from which we
+      received a DESTROY cell. This makes every relay in the circuit path to
+      stop queuing cells. Fixes bug 40623; bugfix on 0.1.0.2-rc.
 
   o Minor features (fallbackdir):
     - Regenerate fallback directories generated on August 11, 2022.
@@ -40,10 +46,10 @@ Changes in version 0.4.6.11 - 2022-08-11
       40601; bugfix on 0.3.5.11.
 
   o Minor bugfixes (metrics port, onion service):
-    - Fix the metrics with a port label to be unique. Before this, all
-      ports of an onion service would be on the same line which violates
-      the Prometheus rules of unique labels. Fixes bug 40581; bugfix
-      on 0.4.5.1-alpha.
+    - The MetricsPort line for an onion service with multiple ports are now
+      unique that is one line per port. Before this, all ports of an onion
+      service would be on the same line which violates the Prometheus rules of
+      unique labels. Fixes bug 40581; bugfix on 0.4.5.1-alpha.
 
   o Minor bugfixes (onion service, client):
     - Fix a fatal assert due to a guard subsystem recursion triggered by
@@ -57,9 +63,9 @@ Changes in version 0.4.6.11 - 2022-08-11
       enabled. Fixes one case of bug 40472; bugfix on 0.3.1.1-alpha.
 
   o Minor bugfixes (relay):
-    - Do not propagate either forward or backward a DESTROY remote
-      reason when closing a circuit so to avoid a possible side channel.
-      Fixes bug 40649; bugfix on 0.1.2.4-alpha.
+    - Do not propagate either forward or backward a DESTROY remote reason when
+      closing a circuit in order to avoid a possible side channel. Fixes bug
+      40649; bugfix on 0.1.2.4-alpha.
 
 
 Changes in version 0.4.6.10 - 2022-02-04
diff --git a/ReleaseNotes b/ReleaseNotes
index 20d2fac70b..54a1076959 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,17 +2,23 @@ This document summarizes new features and bugfixes in each stable
 release of Tor. If you want to see more detailed descriptions of the
 changes in each development snapshot, see the ChangeLog file.
 
-INSERT SUMMARY BLURP
-
 Changes in version 0.4.6.11 - 2022-08-11
+  This version contains two major fixes aimed at reducing memory pressure on
+  relays and possible side-channel. The rest of the fixes were backported for
+  stability or safety purposes.
+
+  This is the very LAST version of this series. As of August 1st 2022, it is
+  end-of-life (EOL). We thus strongly recommend to upgrade to the latest
+  stable of the 0.4.7.x series.
+
   o Major bugfixes (relay):
-    - Remove OR connections btrack subsystem entries when the
-      connections closes normally. Before this, we would only close it
-      on error and thus leaking memory for each normal OR connections.
-      Fixes bug 40604; bugfix on 0.4.0.1-alpha.
-    - Stop sending TRUNCATED cell and instead close the circuits which
-      sends a DESTROY cell so every relay in the circuit path can stop
-      queuing cells. Fixes bug 40623; bugfix on 0.1.0.2-rc.
+    - Remove OR connections btrack subsystem entries when the connections
+      close normally. Before this, we would only remove the entry on error and
+      thus leaking memory for each normal OR connections. Fixes bug 40604;
+      bugfix on 0.4.0.1-alpha.
+    - Stop sending TRUNCATED cell and instead close the circuit from which we
+      received a DESTROY cell. This makes every relay in the circuit path to
+      stop queuing cells. Fixes bug 40623; bugfix on 0.1.0.2-rc.
 
   o Minor features (fallbackdir):
     - Regenerate fallback directories generated on August 11, 2022.
@@ -44,10 +50,10 @@ Changes in version 0.4.6.11 - 2022-08-11
       40601; bugfix on 0.3.5.11.
 
   o Minor bugfixes (metrics port, onion service):
-    - Fix the metrics with a port label to be unique. Before this, all
-      ports of an onion service would be on the same line which violates
-      the Prometheus rules of unique labels. Fixes bug 40581; bugfix
-      on 0.4.5.1-alpha.
+    - The MetricsPort line for an onion service with multiple ports are now
+      unique that is one line per port. Before this, all ports of an onion
+      service would be on the same line which violates the Prometheus rules of
+      unique labels. Fixes bug 40581; bugfix on 0.4.5.1-alpha.
 
   o Minor bugfixes (onion service, client):
     - Fix a fatal assert due to a guard subsystem recursion triggered by
@@ -61,9 +67,9 @@ Changes in version 0.4.6.11 - 2022-08-11
       enabled. Fixes one case of bug 40472; bugfix on 0.3.1.1-alpha.
 
   o Minor bugfixes (relay):
-    - Do not propagate either forward or backward a DESTROY remote
-      reason when closing a circuit so to avoid a possible side channel.
-      Fixes bug 40649; bugfix on 0.1.2.4-alpha.
+    - Do not propagate either forward or backward a DESTROY remote reason when
+      closing a circuit in order to avoid a possible side channel. Fixes bug
+      40649; bugfix on 0.1.2.4-alpha.
 
 
 Changes in version 0.4.6.10 - 2022-02-04