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

[teor at torproject.org]

commit d945a88945a8a20666056a1da31f37d9ad8b50a9
Merge: d4d189964 e56e7e865
Author: teor <teor at torproject.org>
Date:   Fri Oct 25 10:56:02 2019 +1000

    Merge branch 'maint-0.4.0' into release-0.4.0

 .travis.yml                | 12 ++++++++++--
 changes/ticket31919_bionic |  5 +++++
 2 files changed, 15 insertions(+), 2 deletions(-)