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

[teor at torproject.org]

commit 2318bb237fa9ce908efdb0cf89dbeaffe3871939
Merge: 53aa15963 9bb0ca122
Author: teor <teor at torproject.org>
Date:   Tue Oct 22 20:48:13 2019 +1000

    Merge branch 'maint-0.4.0' into maint-0.4.1

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