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

[asn at torproject.org]

commit 5584b6392d2e1f5bbaf9420e3cf5dfa6185d9d6c
Merge: 76f176397 2cc3c98bc
Author: George Kadianakis <desnacked at riseup.net>
Date:   Fri Apr 5 14:57:06 2019 +0300

    Merge branch 'maint-0.4.0'

 .travis.yml      | 13 ++++++++++---
 changes/bug30011 |  4 ++++
 2 files changed, 14 insertions(+), 3 deletions(-)