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

[teor at torproject.org]

commit a4c22164c022aee8db962a08039bc6f1c3905585
Merge: f63cf2158 3207a8e5c
Author: teor <teor at torproject.org>
Date:   Tue Dec 3 12:47:05 2019 +1000

    Merge branch 'maint-0.4.2'

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