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

[teor at torproject.org]

commit 54e2d0dc2d790a9e84ec44db2d53d535d8076602
Merge: e56e7e865 15d67842f
Author: teor <teor at torproject.org>
Date:   Tue Oct 29 08:26:40 2019 +1000

    Merge branch 'maint-0.3.5' into maint-0.4.0

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