commit 0403a2f359d0c03b9f240df234eb0a1503294830 Merge: f20e61020 f98b59524 Author: teor <teor@torproject.org> Date: Tue Oct 22 20:48:23 2019 +1000 Merge branch 'maint-0.4.2' into release-0.4.2 .travis.yml | 12 +++++++----- changes/ticket32177 | 3 +++ 2 files changed, 10 insertions(+), 5 deletions(-)