commit fd4fca378ceaf202f1b8fa6c0440a0bb4f716609 Merge: 0d88b9e8a 4a5c909ce Author: teor teor@torproject.org Date: Wed Oct 23 08:47:20 2019 +1000

Merge branch 'maint-0.4.1' into release-0.4.1

.appveyor.yml | 6 +++--- .travis.yml | 6 ++++-- changes/ticket31372_appveyor | 4 ++++ changes/ticket31372_travis | 4 ++++ 4 files changed, 15 insertions(+), 5 deletions(-)