release: ChangeLog and ReleaseNotes for 0.4.8.10

6 files changed, 46 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 632cd8a751..6bf7731733 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+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 lead 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
+      transport. 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 6030c1ac77..0cc08f9454 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,6 +2,29 @@ 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.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 lead 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
+      transport. 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/changes/bug40897 b/changes/bug40897
deleted file mode 100644
index 0c41033c9d..0000000000
--- a/changes/bug40897
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major bugfixes (TROVE-2023-007, exit):
-    - Improper error propagation from a safety check in conflux leg
-      linking lead 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.
diff --git a/changes/fallbackdirs-2023-12-08 b/changes/fallbackdirs-2023-12-08
deleted file mode 100644
index 884011e989..0000000000
--- a/changes/fallbackdirs-2023-12-08
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Minor features (fallbackdir):
-    - Regenerate fallback directories generated on December 08, 2023.
diff --git a/changes/geoip-2023-12-08 b/changes/geoip-2023-12-08
deleted file mode 100644
index 8d34d777b9..0000000000
--- a/changes/geoip-2023-12-08
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features (geoip data):
-    - Update the geoip files to match the IPFire Location Database,
-      as retrieved on 2023/12/08.
diff --git a/changes/ticket40871 b/changes/ticket40871
deleted file mode 100644
index 32a89eed99..0000000000
--- a/changes/ticket40871
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (bridges, statistics):
-    - Correctly report statistics for client count over Pluggable transport.
-      Fixes bug 40871; bugfix on 0.4.8.4