release: ChangeLog and ReleaseNotes for 0.4.6.9

10 files changed, 90 insertions, 32 deletions

diff --git a/ChangeLog b/ChangeLog
index e1fe3161f1..a49a3a7776 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,48 @@
+INSERT SUMMARY BLURP
+
+Changes in version 0.4.6.9 - 2021-12-15
+  o Major bugfixes (relay, overload):
+    - Don't make Tor DNS timeout trigger an overload general state.
+      These timeouts are different from DNS server timeout. They have to
+      be seen as timeout related to UX and not because of a network
+      problem. Fixes bug 40527; bugfix on 0.4.6.1-alpha.
+
+  o Minor feature (reproducible build):
+    - The repository can now build reproducible tarballs which adds the
+      build command "make dist-reprod" for that purpose. Closes
+      ticket 26299.
+
+  o Minor features (compilation):
+    - Give an error message if trying to build with a version of
+      LibreSSL known not to work with Tor. (There's an incompatibility
+      with LibreSSL versions 3.2.1 through 3.4.0 inclusive because of
+      their incompatibility with OpenSSL 1.1.1's TLSv1.3 APIs.) Closes
+      ticket 40511.
+
+  o Minor features (fallbackdir):
+    - Regenerate fallback directories generated on December 15, 2021.
+
+  o Minor features (geoip data):
+    - Update the geoip files to match the IPFire Location Database, as
+      retrieved on 2021/12/15.
+
+  o Minor bugfixes (compilation):
+    - Fix our configuration logic to detect whether we had OpenSSL 3:
+      previously, our logic was reversed. This has no other effect than
+      to change whether we suppress deprecated API warnings. Fixes bug
+      40429; bugfix on 0.3.5.13.
+
+  o Minor bugfixes (relay):
+    - Reject IPv6-only DirPorts. Our reachability self-test forces
+      DirPorts to be IPv4, but our configuration parser allowed them to
+      be IPv6-only, which led to an assertion failure. Fixes bug 40494;
+      bugfix on 0.4.5.1-alpha.
+
+  o Documentation (man, relay):
+    - Missing "OverloadStatistics" in tor.1 manpage. Fixes bug 40504;
+      bugfix on 0.4.6.1-alpha.
+
+
 Changes in version 0.4.6.8 - 2021-10-26
   This version fixes several bugs from earlier versions of Tor. One
   highlight is a fix on how we track DNS timeouts to report general
diff --git a/ReleaseNotes b/ReleaseNotes
index 483012ed39..fa2d57e194 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,6 +2,51 @@ 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.
 
+INSERT SUMMARY BLURP
+
+Changes in version 0.4.6.9 - 2021-12-15
+  o Major bugfixes (relay, overload):
+    - Don't make Tor DNS timeout trigger an overload general state.
+      These timeouts are different from DNS server timeout. They have to
+      be seen as timeout related to UX and not because of a network
+      problem. Fixes bug 40527; bugfix on 0.4.6.1-alpha.
+
+  o Minor feature (reproducible build):
+    - The repository can now build reproducible tarballs which adds the
+      build command "make dist-reprod" for that purpose. Closes
+      ticket 26299.
+
+  o Minor features (compilation):
+    - Give an error message if trying to build with a version of
+      LibreSSL known not to work with Tor. (There's an incompatibility
+      with LibreSSL versions 3.2.1 through 3.4.0 inclusive because of
+      their incompatibility with OpenSSL 1.1.1's TLSv1.3 APIs.) Closes
+      ticket 40511.
+
+  o Minor features (fallbackdir):
+    - Regenerate fallback directories generated on December 15, 2021.
+
+  o Minor features (geoip data):
+    - Update the geoip files to match the IPFire Location Database, as
+      retrieved on 2021/12/15.
+
+  o Minor bugfixes (compilation):
+    - Fix our configuration logic to detect whether we had OpenSSL 3:
+      previously, our logic was reversed. This has no other effect than
+      to change whether we suppress deprecated API warnings. Fixes bug
+      40429; bugfix on 0.3.5.13.
+
+  o Minor bugfixes (relay):
+    - Reject IPv6-only DirPorts. Our reachability self-test forces
+      DirPorts to be IPv4, but our configuration parser allowed them to
+      be IPv6-only, which led to an assertion failure. Fixes bug 40494;
+      bugfix on 0.4.5.1-alpha.
+
+  o Documentation (man, relay):
+    - Missing "OverloadStatistics" in tor.1 manpage. Fixes bug 40504;
+      bugfix on 0.4.6.1-alpha.
+
+
 Changes in version 0.4.6.8 - 2021-10-26
   This version fixes several bugs from earlier versions of Tor. One
   highlight is a fix on how we track DNS timeouts to report general
diff --git a/changes/bug40429 b/changes/bug40429
deleted file mode 100644
index 9bf3b63818..0000000000
--- a/changes/bug40429
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (compilation):
-    - Fix our configuration logic to detect whether we had OpenSSL 3:
-      previously, our logic was reversed. This has no other effect than to
-      change whether we suppress deprecated API warnings. Fixes
-      bug 40429; bugfix on 0.3.5.13.
diff --git a/changes/fallbackdirs-2021-12-15 b/changes/fallbackdirs-2021-12-15
deleted file mode 100644
index ce08cef5cb..0000000000
--- a/changes/fallbackdirs-2021-12-15
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Minor features (fallbackdir):
-    - Regenerate fallback directories generated on December 15, 2021.
diff --git a/changes/geoip-2021-12-15 b/changes/geoip-2021-12-15
deleted file mode 100644
index 5123557138..0000000000
--- a/changes/geoip-2021-12-15
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features (geoip data):
-    - Update the geoip files to match the IPFire Location Database,
-      as retrieved on 2021/12/15.
diff --git a/changes/ticket26299 b/changes/ticket26299
deleted file mode 100644
index 6b08adf53c..0000000000
--- a/changes/ticket26299
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor feature (reproducible build):
-    - The repository can now build reproducible tarballs which adds the build
-      command "make dist-reprod" for that purpose. Closes ticket 26299.
diff --git a/changes/ticket40494 b/changes/ticket40494
deleted file mode 100644
index a0e6c38443..0000000000
--- a/changes/ticket40494
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (relay):
-    - Reject IPv6-only DirPorts. Our reachability self-test forces DirPorts to
-      be IPv4, but our configuration parser allowed them to be IPv6-only,
-      which led to an assertion failure. Fixes bug 40494; bugfix on
-      0.4.5.1-alpha.
diff --git a/changes/ticket40504 b/changes/ticket40504
deleted file mode 100644
index 9095591419..0000000000
--- a/changes/ticket40504
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Documentation (man, relay):
-    - Missing "OverloadStatistics" in tor.1 manpage. Fixes bug 40504; bugfix on
-      0.4.6.1-alpha.
diff --git a/changes/ticket40511 b/changes/ticket40511
deleted file mode 100644
index 756edd874d..0000000000
--- a/changes/ticket40511
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor features (compilation):
-    - Give an error message if trying to build with a version of LibreSSL
-      known not to work with Tor.  (There's an incompatibility with
-      LibreSSL versions 3.2.1 through 3.4.0 inclusive because of their
-      incompatibility with OpenSSL 1.1.1's TLSv1.3 APIs.)
-      Closes ticket 40511.
diff --git a/changes/ticket40527 b/changes/ticket40527
deleted file mode 100644
index 631b3d4bb9..0000000000
--- a/changes/ticket40527
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes (relay, overload):
-    - Don't make Tor DNS timeout trigger an overload general state. These
-      timeouts are different from DNS server timeout. They have to be seen as
-      timeout related to UX and not because of a network problem. Fixes bug
-      40527; bugfix on 0.4.6.1-alpha.