[tor-commits] [tor/master] Merge branch 'ticket31372_040' into ticket31372_041

[dgoulet at torproject.org]

commit 836b7a538e026d7293430494ea4187e26c6846bf
Merge: 6f3f93d86 246fdd874
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 24 08:04:20 2019 -0400

    Merge branch 'ticket31372_040' into ticket31372_041

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