[tor-commits] [tor/release-0.4.6] Update ChangeLog and ReleaseNotes after tor#40500 was merged.

[ahf at torproject.org]

commit 2ae7a71f433b8d30ab481f31468064063be8f77a
Author: Alexander Færøy <ahf at torproject.org>
Date:   Mon Oct 25 21:16:25 2021 +0000

    Update ChangeLog and ReleaseNotes after tor#40500 was merged.
---
 ChangeLog           | 4 ++++
 ReleaseNotes        | 4 ++++
 changes/ticket40500 | 3 ---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 146b2a6909..e1fe3161f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,10 @@ Changes in version 0.4.6.8 - 2021-10-26
     - Improve logging when a bad HS version is given. Fixes bug 40476;
       bugfix on 0.4.6.1-alpha.
 
+  o Minor bugfix (CI, onion service):
+    - Exclude onion service version 2 Stem tests in our CI. Fixes bug 40500;
+      bugfix on 0.3.2.1-alpha.
+
   o Minor bugfixes (compatibility):
     - Fix compatibility with the most recent Libevent versions, which no
       longer have an evdns_set_random_bytes() function. Because this
diff --git a/ReleaseNotes b/ReleaseNotes
index 13fe228fc2..483012ed39 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -42,6 +42,10 @@ Changes in version 0.4.6.8 - 2021-10-26
     - Improve logging when a bad HS version is given. Fixes bug 40476;
       bugfix on 0.4.6.1-alpha.
 
+  o Minor bugfix (CI, onion service):
+    - Exclude onion service version 2 Stem tests in our CI. Fixes bug 40500;
+      bugfix on 0.3.2.1-alpha.
+
   o Minor bugfixes (compatibility):
     - Fix compatibility with the most recent Libevent versions, which no
       longer have an evdns_set_random_bytes() function. Because this
diff --git a/changes/ticket40500 b/changes/ticket40500
deleted file mode 100644
index 2e5ff39761..0000000000
--- a/changes/ticket40500
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfix (CI, onion service):
-    - Exclude onion service version 2 Stem tests in our CI. Fixes bug 40500;
-      bugfix on 0.3.2.1-alpha.