commit 70711448592d384481e9914829c8e409b53833dd Merge: 0cb57a490 836b7a538 Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 24 08:04:41 2019 -0400

Merge branch 'ticket31372_041' into ticket31372_042

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