commit e15b9b1790b5421ff8e1a375fcb4ddb07015c04a Merge: 1dd952789 6bc8dedbe Author: teor <teor@torproject.org> Date: Thu Aug 8 11:07:11 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1156' into maint-0.3.5 .travis.yml | 25 +++++++++++++++++++------ changes/chutney_ci | 3 +++ 2 files changed, 22 insertions(+), 6 deletions(-)