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

[asn at torproject.org]

commit d05db86010bc54d5c6dba525ded3028b5839ceb2
Merge: 2ecd36f3c 357e9a6f2
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Aug 27 11:49:36 2019 +0300

    Merge branch 'maint-0.4.0' into release-0.4.0

 .travis.yml      | 2 +-
 changes/bug31463 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)