commit 23e401749ffb0676d30a52bbc80c94da5e4a8b65 Merge: 5ff42674e 26fd31fef Author: Nick Mathewson nickm@torproject.org Date: Wed Mar 25 10:56:27 2020 -0400

Merge branch 'maint-0.4.1' into release-0.4.1

.appveyor.yml | 16 ++++++++++++++-- changes/bug33673 | 6 ++++++ 2 files changed, 20 insertions(+), 2 deletions(-)