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

[teor at torproject.org]

commit df9a1f313799403b813c5645bf5554ee16233517
Merge: 189287e7b 3207a8e5c
Author: teor <teor at torproject.org>
Date:   Tue Dec 3 12:47:02 2019 +1000

    Merge branch 'maint-0.4.2' into release-0.4.2

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