commit 4a5c909ce5e91e916620de4b8dde28d42b4d4d8e
Merge: 3c071f300 57acdaa3f
Author: teor <teor(a)torproject.org>
Date: Wed Oct 23 08:47:15 2019 +1000
Merge branch 'maint-0.4.0' into maint-0.4.1
.appveyor.yml | 6 +++---
.travis.yml | 6 ++++--
changes/ticket31372_appveyor | 4 ++++
changes/ticket31372_travis | 4 ++++
4 files changed, 15 insertions(+), 5 deletions(-)