commit 4ded6981bea42e0efe3cd78aca790ca0064c6088 Merge: 90b8c2167 62cf12a8b Author: teor <teor@torproject.org> Date: Tue Dec 3 12:46:39 2019 +1000 Merge branch 'maint-0.3.5' into release-0.3.5 .travis.yml | 14 +++++++++----- changes/ticket32500 | 5 +++++ 2 files changed, 14 insertions(+), 5 deletions(-)