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

[nickm at torproject.org]

commit 82e1ec4087de41d25e35f838843074cbef1ca6cc
Merge: 918bda25a d8409ccb7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 7 08:34:46 2019 -0500

    Merge branch 'maint-0.4.0'

 .appveyor.yml    | 23 +++++++++++++++++++++--
 changes/bug29601 |  6 ++++++
 2 files changed, 27 insertions(+), 2 deletions(-)