Merge branch 'changelogs' into 'main'HEADmain

forward-port the 0.4.8.10 and .11 changelogs

See merge request tpo/core/tor!814

2 files changed, 98 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index a0421ea3ac..55b02340fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,52 @@
+Changes in version 0.4.8.11 - 2024-04-10
+  This is a minor release mostly to upgrade the fallbackdir list.
+  Directory authorities running this version will now automatically
+  reject relays running the end of life 0.4.7.x version.
+
+  o Minor features (directory authorities):
+    - Reject 0.4.7.x series at the authority level. Closes ticket 40896.
+    - New IP address and keys for tor26.
+    - Allow BandwidthFiles "node_id" KeyValue without the dollar sign at
+      the start of the hexdigit, in order to easier database queries
+      combining Tor documents in which the relays fingerprint does not
+      include it. Fixes bug 40891; bugfix on 0.4.7 (all supported
+      versions of Tor).
+
+  o Minor features (fallbackdir):
+    - Regenerate fallback directories generated on April 10, 2024.
+
+  o Minor features (geoip data):
+    - Update the geoip files to match the IPFire Location Database, as
+      retrieved on 2024/04/10.
+
+  o Minor bugfixes (directory authorities):
+    - Add a warning when publishing a vote or signatures to another
+      directory authority fails. Fixes bug 40910; bugfix on 0.2.0.3-alpha.
+
+
+Changes in version 0.4.8.10 - 2023-12-08
+  This is a security release fixing a high severity bug (TROVE-2023-007)
+  affecting Exit relays supporting Conflux. We strongly recommend to update as
+  soon as possible.
+
+  o Major bugfixes (TROVE-2023-007, exit):
+    - Improper error propagation from a safety check in conflux leg
+      linking led to a desynchronization of which legs were part of a
+      conflux set, ultimately causing a UAF and NULL pointer dereference
+      crash on Exit relays. Fixes bug 40897; bugfix on 0.4.8.1-alpha.
+
+  o Minor features (fallbackdir):
+    - Regenerate fallback directories generated on December 08, 2023.
+
+  o Minor features (geoip data):
+    - Update the geoip files to match the IPFire Location Database, as
+      retrieved on 2023/12/08.
+
+  o Minor bugfixes (bridges, statistics):
+    - Correctly report statistics for client count over pluggable
+      transports. Fixes bug 40871; bugfix on 0.4.8.4.
+
+
 Changes in version 0.4.8.9 - 2023-11-09
   This is another security release fixing a high severity bug affecting onion
   services which is tracked by TROVE-2023-006. We are also releasing a guard
diff --git a/ReleaseNotes b/ReleaseNotes
index 362e687306..151236620d 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,6 +2,55 @@ 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.
 
+Changes in version 0.4.8.11 - 2024-04-10
+  This is a minor release mostly to upgrade the fallbackdir list.
+  Directory authorities running this version will now automatically
+  reject relays running the end of life 0.4.7.x version.
+
+  o Minor features (directory authorities):
+    - Reject 0.4.7.x series at the authority level. Closes ticket 40896.
+    - New IP address and keys for tor26.
+    - Allow BandwidthFiles "node_id" KeyValue without the dollar sign at
+      the start of the hexdigit, in order to easier database queries
+      combining Tor documents in which the relays fingerprint does not
+      include it. Fixes bug 40891; bugfix on 0.4.7 (all supported
+      versions of Tor).
+
+  o Minor features (fallbackdir):
+    - Regenerate fallback directories generated on April 10, 2024.
+
+  o Minor features (geoip data):
+    - Update the geoip files to match the IPFire Location Database, as
+      retrieved on 2024/04/10.
+
+  o Minor bugfixes (directory authorities):
+    - Add a warning when publishing a vote or signatures to another
+      directory authority fails. Fixes bug 40910; bugfix on 0.2.0.3-alpha.
+
+
+Changes in version 0.4.8.10 - 2023-12-08
+  This is a security release fixing a high severity bug (TROVE-2023-007)
+  affecting Exit relays supporting Conflux. We strongly recommend to update as
+  soon as possible.
+
+  o Major bugfixes (TROVE-2023-007, exit):
+    - Improper error propagation from a safety check in conflux leg
+      linking led to a desynchronization of which legs were part of a
+      conflux set, ultimately causing a UAF and NULL pointer dereference
+      crash on Exit relays. Fixes bug 40897; bugfix on 0.4.8.1-alpha.
+
+  o Minor features (fallbackdir):
+    - Regenerate fallback directories generated on December 08, 2023.
+
+  o Minor features (geoip data):
+    - Update the geoip files to match the IPFire Location Database, as
+      retrieved on 2023/12/08.
+
+  o Minor bugfixes (bridges, statistics):
+    - Correctly report statistics for client count over pluggable
+      transports. Fixes bug 40871; bugfix on 0.4.8.4.
+
+
 Changes in version 0.4.8.9 - 2023-11-09
   This is another security release fixing a high severity bug affecting onion
   services which is tracked by TROVE-2023-006. We are also releasing a guard