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

[nickm at torproject.org]

commit 5b07ff40112390518d95caa90447cd5faf938cf7
Merge: 6a72cc259 c8447f95e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 10 18:44:31 2019 -0400

    Merge branch 'maint-0.4.0' into maint-0.4.1

 .travis.yml      | 4 ++++
 changes/bug30744 | 3 +++
 2 files changed, 7 insertions(+)