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

[teor at torproject.org]

commit 8b5c11fbf6a408147e61ce96812faebca1580c61
Merge: da404910a 84c4ede05
Author: teor <teor at torproject.org>
Date:   Mon Dec 16 09:23:46 2019 +1000

    Merge branch 'bug32240_32242_041' into bug32240_32242_042

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