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

[teor at torproject.org]

commit 13155e241ec73a2f10e2029075972e87e33e82c9
Merge: 4eb55297d 63aff4a43
Author: teor <teor at torproject.org>
Date:   Tue Oct 29 08:26:51 2019 +1000

    Merge branch 'maint-0.4.1' into release-0.4.1

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