[tor-commits] [tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1459' into bug32240_32242_035

[teor at torproject.org]

commit 0b3763612cfd74fd8e1ee79f6fbe58a70e4288b8
Merge: 75096de4c 434248664
Author: teor <teor at torproject.org>
Date:   Mon Dec 16 09:21:05 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/1459' into bug32240_32242_035

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