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

[teor at torproject.org]

commit 3207a8e5c21de7d49d7e1c854bf6c0dba23d84a1
Merge: eb8170408 14089a29b
Author: teor <teor at torproject.org>
Date:   Tue Dec 3 12:46:58 2019 +1000

    Merge branch 'maint-0.4.1' into maint-0.4.2

 .travis.yml         | 14 +++++++++-----
 changes/ticket32500 |  5 +++++
 2 files changed, 14 insertions(+), 5 deletions(-)