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

[teor at torproject.org]

commit 93d12baf89c2a55b8a3e40a026b3990dd671a1f7
Merge: a255ca9b1 9ef8f5d1b
Author: teor <teor at torproject.org>
Date:   Mon Mar 16 20:54:34 2020 +1000

    Merge branch 'maint-0.4.2' into maint-0.4.3

 .travis.yml         | 2 +-
 changes/ticket32792 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)