release: ChangeLog and ReleaseNotes for 0.4.8.12

8 files changed, 56 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index 27cfb1f54e..3dd1de5449 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+Changes in version 0.4.8.12 - 2024-06-06
+  This is a minor release with couple bugfixes affecting conflux and logging.
+  We also have the return of faravahar directory authority with new keys and
+  address.
+
+  o Minor feature (dirauth):
+    - Add back faravahar with a new address and new keys. Closes 40689.
+
+  o Minor features (fallbackdir):
+    - Regenerate fallback directories generated on June 06, 2024.
+
+  o Minor features (geoip data):
+    - Update the geoip files to match the IPFire Location Database, as
+      retrieved on 2024/06/06.
+
+  o Minor bugfix (circuit):
+    - Remove a log_warn being triggered by a protocol violation that
+      already emits a protocol warning log. Fixes bug 40932; bugfix
+      on 0.4.8.1-alpha.
+
+  o Minor bugfixes (conflux):
+    - Avoid a potential hard assert (crash) when sending a cell on a
+      Conflux set. Fixes bug 40921; bugfix on 0.4.8.1-alpha.
+    - Make sure we don't process a closed circuit when packaging data.
+      This lead to a non fatal BUG() spamming logs. Fixes bug 40908;
+      bugfix on 0.4.8.1-alpha.
+
+
 Changes in version 0.4.8.11 - 2024-04-10
   This is a minor release mostly to upgrade the fallbackdir list. Worth noting
   also that directory authority running this version will now automatically
diff --git a/ReleaseNotes b/ReleaseNotes
index dd00788d1f..2f9b5953ee 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,6 +2,34 @@ 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.12 - 2024-06-06
+  This is a minor release with couple bugfixes affecting conflux and logging.
+  We also have the return of faravahar directory authority with new keys and
+  address.
+
+  o Minor feature (dirauth):
+    - Add back faravahar with a new address and new keys. Closes 40689.
+
+  o Minor features (fallbackdir):
+    - Regenerate fallback directories generated on June 06, 2024.
+
+  o Minor features (geoip data):
+    - Update the geoip files to match the IPFire Location Database, as
+      retrieved on 2024/06/06.
+
+  o Minor bugfix (circuit):
+    - Remove a log_warn being triggered by a protocol violation that
+      already emits a protocol warning log. Fixes bug 40932; bugfix
+      on 0.4.8.1-alpha.
+
+  o Minor bugfixes (conflux):
+    - Avoid a potential hard assert (crash) when sending a cell on a
+      Conflux set. Fixes bug 40921; bugfix on 0.4.8.1-alpha.
+    - Make sure we don't process a closed circuit when packaging data.
+      This lead to a non fatal BUG() spamming logs. Fixes bug 40908;
+      bugfix on 0.4.8.1-alpha.
+
+
 Changes in version 0.4.8.11 - 2024-04-10
   This is a minor release mostly to upgrade the fallbackdir list. Worth noting
   also that directory authority running this version will now automatically
diff --git a/changes/fallbackdirs-2024-06-06 b/changes/fallbackdirs-2024-06-06
deleted file mode 100644
index 7775f953c7..0000000000
--- a/changes/fallbackdirs-2024-06-06
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Minor features (fallbackdir):
-    - Regenerate fallback directories generated on June 06, 2024.
diff --git a/changes/geoip-2024-06-06 b/changes/geoip-2024-06-06
deleted file mode 100644
index 2827b8649c..0000000000
--- a/changes/geoip-2024-06-06
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features (geoip data):
-    - Update the geoip files to match the IPFire Location Database,
-      as retrieved on 2024/06/06.
diff --git a/changes/ticket40689 b/changes/ticket40689
deleted file mode 100644
index 735d3df02f..0000000000
--- a/changes/ticket40689
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor feature (dirauth):
-    - Add back faravahar with a new address and new keys. Closes 40689.
-
diff --git a/changes/ticket40908 b/changes/ticket40908
deleted file mode 100644
index 28cd3f0f36..0000000000
--- a/changes/ticket40908
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (conflux):
-    - Make sure we don't process a closed circuit when packaging data. This lead
-      to a non fatal BUG() spamming logs. Fixes bug 40908; bugfix on
-      0.4.8.1-alpha.
-
diff --git a/changes/ticket40921 b/changes/ticket40921
deleted file mode 100644
index 5818b91864..0000000000
--- a/changes/ticket40921
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (conflux):
-    - Avoid a potential hard assert (crash) when sending a cell on a Conflux
-      set. Fixes bug 40921; bugfix on 0.4.8.1-alpha.
diff --git a/changes/ticket40932 b/changes/ticket40932
deleted file mode 100644
index 10e1b651c4..0000000000
--- a/changes/ticket40932
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfix (circuit):
-    - Remove a log_warn being triggered by a protocol violation that already
-      emits a protocol warning log. Fixes bug 40932; bugfix on 0.4.8.1-alpha.