release: ChangeLog and ReleaseNotes for 0.4.7.12

7 files changed, 54 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 9085bb48f8..f108973171 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+Changes in version 0.4.7.12 - 2022-12-06
+  This version contains a major change that is a new key for moria1. Also, new
+  metrics are exported on the MetricsPort for the congestion control
+  subsystem.
+
+  o Directory authority changes (moria1):
+    - Rotate the relay identity key and v3 identity key for moria1. They
+      have been online for more than a decade and refreshing keys
+      periodically is good practice. Advertise new ports too, to avoid
+      confusion. Closes ticket 40722.
+
+  o Minor feature (Congestion control metrics):
+    - Add additional metricsport relay metrics for congestion control.
+      Closes ticket 40724.
+
+  o Minor features (fallbackdir):
+    - Regenerate fallback directories generated on December 06, 2022.
+
+  o Minor features (geoip data):
+    - Update the geoip files to match the IPFire Location Database, as
+      retrieved on 2022/12/06.
+
+  o Minor bugfixes (cpuworker, relay):
+    - Fix an off by one overload calculation on the number of CPUs being
+      used by our thread pool. Fixes bug 40719; bugfix on 0.3.5.1-alpha.
+
+
 Changes in version 0.4.7.11 - 2022-11-10
   This version contains several major fixes aimed at helping defend against
   network denial of service. It is also extending drastically the MetricsPort
diff --git a/ReleaseNotes b/ReleaseNotes
index 2f43a8b876..6dc9b19239 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,6 +2,33 @@ 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.7.12 - 2022-12-06
+  This version contains a major change that is a new key for moria1. Also, new
+  metrics are exported on the MetricsPort for the congestion control
+  subsystem.
+
+  o Directory authority changes (moria1):
+    - Rotate the relay identity key and v3 identity key for moria1. They
+      have been online for more than a decade and refreshing keys
+      periodically is good practice. Advertise new ports too, to avoid
+      confusion. Closes ticket 40722.
+
+  o Minor feature (Congestion control metrics):
+    - Add additional metricsport relay metrics for congestion control.
+      Closes ticket 40724.
+
+  o Minor features (fallbackdir):
+    - Regenerate fallback directories generated on December 06, 2022.
+
+  o Minor features (geoip data):
+    - Update the geoip files to match the IPFire Location Database, as
+      retrieved on 2022/12/06.
+
+  o Minor bugfixes (cpuworker, relay):
+    - Fix an off by one overload calculation on the number of CPUs being
+      used by our thread pool. Fixes bug 40719; bugfix on 0.3.5.1-alpha.
+
+
 Changes in version 0.4.7.11 - 2022-11-10
   This version contains several major fixes aimed at helping defend against
   network denial of service. It is also extending drastically the MetricsPort
diff --git a/changes/fallbackdirs-2022-12-06 b/changes/fallbackdirs-2022-12-06
deleted file mode 100644
index 17daf63f53..0000000000
--- a/changes/fallbackdirs-2022-12-06
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Minor features (fallbackdir):
-    - Regenerate fallback directories generated on December 06, 2022.
diff --git a/changes/geoip-2022-12-06 b/changes/geoip-2022-12-06
deleted file mode 100644
index f96e833e63..0000000000
--- a/changes/geoip-2022-12-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 2022/12/06.
diff --git a/changes/ticket40719 b/changes/ticket40719
deleted file mode 100644
index eec84dce0f..0000000000
--- a/changes/ticket40719
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (cpuworker, relay):
-    - Fix an off by one overload calculation on the number of CPUs being used by
-      our thread pool. Fixes bug 40719; bugfix on 0.3.5.1-alpha.
diff --git a/changes/ticket40722 b/changes/ticket40722
deleted file mode 100644
index a9a9f520a9..0000000000
--- a/changes/ticket40722
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Directory authority changes (moria1):
-    - Rotate the relay identity key and v3 identity key for moria1. They
-      have been online for more than a decade and refreshing keys
-      periodically is good practice. Advertise new ports too, to avoid
-      confusion. Closes ticket 40722.
diff --git a/changes/ticket40724 b/changes/ticket40724
deleted file mode 100644
index aeb6f9ae8b..0000000000
--- a/changes/ticket40724
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor feature (Congestion control metrics):
-    - Add additional metricsport relay metrics for congestion control.
-      Closes ticket 40724.