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

[teor at torproject.org]

commit 03dc0e19a1a498c7df390899e01b7830e3186b85
Merge: c88fce132 febbc236d
Author: teor <teor at torproject.org>
Date:   Tue Dec 3 12:46:47 2019 +1000

    Merge branch 'maint-0.4.0' into release-0.4.0

 .travis.yml         | 14 +++++++++-----
 changes/ticket32500 |  5 +++++
 2 files changed, 14 insertions(+), 5 deletions(-)