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

[teor at torproject.org]

commit af3ab180bf89c59402e90760ec02cc91ddf94573
Merge: f05cfda3e 9bb0ca122
Author: teor <teor at torproject.org>
Date:   Tue Oct 22 20:48:09 2019 +1000

    Merge branch 'maint-0.4.0' into release-0.4.0

 .travis.yml         | 12 +++++++-----
 changes/ticket32177 |  3 +++
 2 files changed, 10 insertions(+), 5 deletions(-)