commit c22601765d7b5fcf833a04db3784b2620ffd77e0 Merge: aed3a3f79 048714d2c Author: Nick Mathewson nickm@torproject.org Date: Wed Mar 25 10:56:27 2020 -0400

Merge branch 'maint-0.4.2' into release-0.4.2

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