commit 9152692b99a92c40278faa5fd78fca8f5c6d17f7 Merge: 5c78bd322 d8409ccb7 Author: Nick Mathewson nickm@torproject.org Date: Thu Mar 7 08:34:44 2019 -0500

Merge branch 'maint-0.4.0' into release-0.4.0

.appveyor.yml | 23 +++++++++++++++++++++-- changes/bug29601 | 6 ++++++ 2 files changed, 27 insertions(+), 2 deletions(-)