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

[teor at torproject.org]

commit ff601da0d18622dad0bbf901fea41d7bdd248ba2
Merge: d945a8894 54e2d0dc2
Author: teor <teor at torproject.org>
Date:   Tue Oct 29 08:26:44 2019 +1000

    Merge branch 'maint-0.4.0' into release-0.4.0

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