commit dbadfe75e60b9ad6ddfbb2907de97486534aa8c2 Merge: 3e42004e5 3e8e4af1a Author: teor <teor@torproject.org> Date: Fri Mar 13 13:00:58 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1735' into maint-0.4.3 .travis.yml | 64 +++++++++++++++++++++++++++++++---------------------- changes/ticket33194 | 4 ++++ changes/ticket33195 | 4 ++++ 3 files changed, 46 insertions(+), 26 deletions(-)