[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

[nickm at torproject.org]

commit 6965798a160e7caa07899216f35deeee9d6641ed
Merge: 4c8af10f0 4013e50cb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 22 12:10:30 2019 -0400

    Merge branch 'maint-0.4.0' into maint-0.4.1

 .appveyor.yml    | 12 ++++++++++++
 changes/bug31884 |  3 +++
 2 files changed, 15 insertions(+)