commit 518b69b57cbb33bc382892377d4b1208e14d8a8d Merge: fb977f8ca 121854629 Author: teor teor@torproject.org Date: Thu Aug 8 10:54:12 2019 +1000

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

.travis.yml | 22 +--------------------- changes/ticket30213 | 3 +++ 2 files changed, 4 insertions(+), 21 deletions(-)