[tor-commits] [tor/maint-0.4.0] Merge branch 'bug32240_035' into bug32240_040

[teor at torproject.org]

commit e2f78396f400dff5b28f6fdf845a9bcf7a8d1b85
Merge: 748117298 75096de4c
Author: teor <teor at torproject.org>
Date:   Mon Dec 16 09:14:32 2019 +1000

    Merge branch 'bug32240_035' into bug32240_040

 .travis.yml         | 7 +++----
 changes/ticket32240 | 4 ++++
 2 files changed, 7 insertions(+), 4 deletions(-)