commit 2504bce7c3bccac0f225fa116bcaef2d64696de6 Author: Alexander Færøy ahf@torproject.org Date: Mon Oct 25 21:08:07 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 13bc05f610..4cec8341eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -47,6 +47,10 @@ Changes in version 0.4.5.11 - 2021-10-26 immediately from startup. Previously, they waited until they had been running for a full day. Closes ticket 40337.

+ 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 bugfix (onion service, backport from 0.4.6.8): - Do not flag an HSDir as non-running in case the descriptor upload or fetch fails. An onion service closes pending directory diff --git a/ReleaseNotes b/ReleaseNotes index ed07c1703b..15e53b2b93 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -51,6 +51,10 @@ Changes in version 0.4.5.11 - 2021-10-26 immediately from startup. Previously, they waited until they had been running for a full day. Closes ticket 40337.

+ 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 bugfix (onion service, backport from 0.4.6.8): - Do not flag an HSDir as non-running in case the descriptor upload or fetch fails. An onion service closes pending directory 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.