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

[teor at torproject.org]

commit b448f6044d37959f2b9bea3c5c2bc5f98c4d9170
Merge: bf16efeb0 2395800d3
Author: teor <teor at torproject.org>
Date:   Tue Oct 29 08:27:02 2019 +1000

    Merge branch 'maint-0.4.2'

 .travis.yml         | 7 ++++---
 changes/ticket32241 | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)