commit 9bb0ca122f13255982566b440b0b9d03b6a9e44b Merge: 89ead08ee bed439013 Author: teor <teor@torproject.org> Date: Tue Oct 22 20:48:05 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 12 +++++++----- changes/ticket32177 | 3 +++ 2 files changed, 10 insertions(+), 5 deletions(-)