[tor-commits] [tor/release-0.4.3] incorporate 33545 into changelog.

[nickm at torproject.org]

commit 251efd11e77df6c27fec9cb75c65fa614a063a74
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 13 14:17:55 2020 -0400

    incorporate 33545 into changelog.
---
 ChangeLog        | 5 ++++-
 changes/bug33545 | 4 ----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e015993bb..3aa6edceb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.4.3.4-rc - 2020-04-1?
+Changes in version 0.4.3.4-rc - 2020-04-13
   Tor 0.4.3.4-rc is the first release candidate in its series. It fixes
   several bugs from earlier versions, including one affecting DoS
   defenses on bridges using pluggable transports.
@@ -70,6 +70,9 @@ Changes in version 0.4.3.4-rc - 2020-04-1?
       decoding onion service descriptors as a relay. Also add some
       diagnostics to debug any future bugs in that area. Fixes bug
       31669; bugfix on 0.3.0.1-alpha.
+    - Block a client-side assertion by disallowing the registration of
+      an x25519 client auth key that's all zeroes. Fixes bug 33545;
+      bugfix on 0.4.3.1-alpha. Based on patch from "cypherpunks".
 
   o Code simplification and refactoring:
     - Disable our coding standards best practices tracker in our git
diff --git a/changes/bug33545 b/changes/bug33545
deleted file mode 100644
index c051b0160..000000000
--- a/changes/bug33545
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (hidden services):
-    - Block a client-side assert by disallowing the registration of an x25519
-      client auth key that's all zeroes. Fixes bug 33545; bugfix on
-      0.4.3.1-alpha. Patch based on patch from "cypherpunks".
\ No newline at end of file