release: ChangeLog and ReleaseNotes for 0.4.8.5

8 files changed, 64 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index 3669a5c39f..965bb110f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+Changes in version 0.4.8.5 - 2023-08-30
+  Quick second release after the first stable few days ago fixing minor
+  annoying bugfixes creating log BUG stacktrace. We also fix BSD compilation
+  failures and PoW unit test.
+
+  o Minor features (fallbackdir):
+    - Regenerate fallback directories generated on August 30, 2023.
+
+  o Minor features (geoip data):
+    - Update the geoip files to match the IPFire Location Database, as
+      retrieved on 2023/08/30.
+
+  o Minor bugfix (NetBSD, compilation):
+    - Fix compilation issue on NetBSD by avoiding an unnecessary
+      dependency on "huge" page mappings in Equi-X. Fixes bug 40843;
+      bugfix on 0.4.8.1-alpha.
+
+  o Minor bugfix (NetBSD, testing):
+    - Fix test failures in "crypto/hashx" and "slow/crypto/equix" on
+      x86_64 and aarch64 NetBSD hosts, by adding support for
+      PROT_MPROTECT() flags. Fixes bug 40844; bugfix on 0.4.8.1-alpha.
+
+  o Minor bugfixes (conflux):
+    - Demote a relay-side warn about too many legs to ProtocolWarn, as
+      there are conditions that it can briefly happen during set
+      construction. Also add additional set logging details for all
+      error cases. Fixes bug 40841; bugfix on 0.4.8.1-alpha.
+    - Prevent non-fatal assert stacktrace caused by using conflux sets
+      during their teardown process. Fixes bug 40842; bugfix
+      on 0.4.8.1-alpha.
+
+
 Changes in version 0.4.8.4 - 2023-08-23
   Finally, this is the very first stable release of the 0.4.8.x series making
   Proof-of-Work (prop#327) and Conflux (prop#329) available to the entire
diff --git a/ReleaseNotes b/ReleaseNotes
index 3504ec179c..589c67bae0 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,6 +2,38 @@ 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.5 - 2023-08-30
+  Quick second release after the first stable few days ago fixing minor
+  annoying bugfixes creating log BUG stacktrace. We also fix BSD compilation
+  failures and PoW unit test.
+
+  o Minor features (fallbackdir):
+    - Regenerate fallback directories generated on August 30, 2023.
+
+  o Minor features (geoip data):
+    - Update the geoip files to match the IPFire Location Database, as
+      retrieved on 2023/08/30.
+
+  o Minor bugfix (NetBSD, compilation):
+    - Fix compilation issue on NetBSD by avoiding an unnecessary
+      dependency on "huge" page mappings in Equi-X. Fixes bug 40843;
+      bugfix on 0.4.8.1-alpha.
+
+  o Minor bugfix (NetBSD, testing):
+    - Fix test failures in "crypto/hashx" and "slow/crypto/equix" on
+      x86_64 and aarch64 NetBSD hosts, by adding support for
+      PROT_MPROTECT() flags. Fixes bug 40844; bugfix on 0.4.8.1-alpha.
+
+  o Minor bugfixes (conflux):
+    - Demote a relay-side warn about too many legs to ProtocolWarn, as
+      there are conditions that it can briefly happen during set
+      construction. Also add additional set logging details for all
+      error cases. Fixes bug 40841; bugfix on 0.4.8.1-alpha.
+    - Prevent non-fatal assert stacktrace caused by using conflux sets
+      during their teardown process. Fixes bug 40842; bugfix
+      on 0.4.8.1-alpha.
+
+
 Changes in version 0.4.8.4 - 2023-08-23
   Finally, this is the very first stable release of the 0.4.8.x series making,
   among other features, Proof-of-Work (prop#327) and Conflux (prop#329)
diff --git a/changes/bug40841 b/changes/bug40841
deleted file mode 100644
index 2e67db3261..0000000000
--- a/changes/bug40841
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (conflux):
-    - Demote a relay-side warn about too many legs to ProtocolWarn,
-      as there are conditions that it can briefly happen during set
-      construction. Also add additional set logging details for
-      all error cases. Fixes bug 40841; bugfix on 0.4.8.1-alpha.
diff --git a/changes/bug40842 b/changes/bug40842
deleted file mode 100644
index bf3bd8bd03..0000000000
--- a/changes/bug40842
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (conflux):
-    - Prevent non-fatal assert stacktrace caused by using conflux
-      sets during their teardown process. Fixes bug 40842;
-      bugfix on 0.4.8.1-alpha.
diff --git a/changes/fallbackdirs-2023-08-30 b/changes/fallbackdirs-2023-08-30
deleted file mode 100644
index 499fc8e168..0000000000
--- a/changes/fallbackdirs-2023-08-30
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Minor features (fallbackdir):
-    - Regenerate fallback directories generated on August 30, 2023.
diff --git a/changes/geoip-2023-08-30 b/changes/geoip-2023-08-30
deleted file mode 100644
index 2238cbf788..0000000000
--- a/changes/geoip-2023-08-30
+++ /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/08/30.
diff --git a/changes/ticket40843 b/changes/ticket40843
deleted file mode 100644
index 3af63a9164..0000000000
--- a/changes/ticket40843
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfix (NetBSD, compilation):
-    - Fix compilation issue on NetBSD by avoiding an unnecessary dependency on
-      "huge" page mappings in Equi-X. Fixes bug 40843; bugfix on 0.4.8.1-alpha.
\ No newline at end of file
diff --git a/changes/ticket40844 b/changes/ticket40844
deleted file mode 100644
index 73d3bb2b76..0000000000
--- a/changes/ticket40844
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfix (NetBSD, testing):
-    - Fix test failures in "crypto/hashx" and "slow/crypto/equix" on x86_64
-      and aarch64 NetBSD hosts, by adding support for PROT_MPROTECT() flags.
-      Fixes bug 40844; bugfix on 0.4.8.1-alpha.
\ No newline at end of file