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

[teor at torproject.org]

commit c22696e3606f9873ddbf02b11dc91214853b8317
Merge: 7a9e2a261 1c688ba92
Author: teor <teor at torproject.org>
Date:   Mon Mar 16 20:54:20 2020 +1000

    Merge branch 'maint-0.3.5' into maint-0.4.1

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