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

[nickm at torproject.org]

commit 66c307751695eb01b6b535462515e66a53ee55a2
Merge: 0fe3b373a c8447f95e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 10 18:44:31 2019 -0400

    Merge branch 'maint-0.4.0' into release-0.4.0

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