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

[teor at torproject.org]

commit dbae58d58001b8404aa805512065d123f2d6ee1a
Merge: 8f8e1523e 2395800d3
Author: teor <teor at torproject.org>
Date:   Tue Oct 29 08:26:59 2019 +1000

    Merge branch 'maint-0.4.2' into release-0.4.2

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