commit 8d22c09abf47da229229fe6b5fe355a2da530bef Merge: 518b69b57 75f9ae902 Author: teor teor@torproject.org Date: Thu Aug 8 10:55:24 2019 +1000

Merge remote-tracking branch 'tor-github/pr/1155' into maint-0.2.9

.travis.yml | 18 ++++++++++++++---- changes/chutney_ci | 3 +++ 2 files changed, 17 insertions(+), 4 deletions(-)