commit a2f666aa2516049df7cf831d6d21d7ee5d1a68e4 Merge: 1bdab6819 2318bb237 Author: teor <teor@torproject.org> Date: Tue Oct 22 20:48:16 2019 +1000 Merge branch 'maint-0.4.1' into release-0.4.1 .travis.yml | 12 +++++++----- changes/ticket32177 | 3 +++ 2 files changed, 10 insertions(+), 5 deletions(-)