commit 47e0ac3561aad79f1647d9d926277300ee78434f Merge: d8cef680f add387c50 Author: teor <teor@torproject.org> Date: Fri Mar 13 13:01:14 2020 +1000 Merge branch 'maint-0.3.5' into release-0.3.5 .travis.yml | 57 ++++++++++++++++++++++++++++++++--------------------- changes/ticket33194 | 4 ++++ changes/ticket33195 | 4 ++++ 3 files changed, 42 insertions(+), 23 deletions(-)