[tor-commits] [tor/main] Add Changelog and ReleaseNotes entry for tor#40500.

[ahf at torproject.org]

commit 0c521881f68aa8e2646775ff6951214f503e2f79
Author: Alexander Færøy <ahf at torproject.org>
Date:   Mon Oct 25 21:18:35 2021 +0000

    Add Changelog and ReleaseNotes entry for tor#40500.
---
 ChangeLog           | 4 ++++
 ReleaseNotes        | 4 ++++
 changes/ticket40500 | 3 ---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3cd9cc33de..4239f86a31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -99,6 +99,10 @@ Changes in version 0.4.7.2-alpha - 2021-10-26
       service leading to filling the logs with useless warnings. Fixes
       bug 34083; bugfix on 0.3.2.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 (onion service, config):
     - Fix a memory leak for a small config line string that could occur
       if the onion service failed to be configured from file properly.
diff --git a/ReleaseNotes b/ReleaseNotes
index 8bcb61e7fa..34b8113bcb 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -32,6 +32,10 @@ Changes in version 0.4.6.7 - 2021-08-16
     - Send back the extended SOCKS error 0xF6 (Onion Service Invalid Address)
       for a v2 onion address. Fixes bug 40421; bugfix on 0.4.6.2-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 (relay):
     - Reduce the compression level for data streaming from HIGH to LOW in
       order to reduce CPU load on the directory relays. Fixes bug 40301;
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.