commit 202ccc3930be8d93424303cc13a5c80c58c07817 Merge: a58c4cc6d 6b2d8b1a7 Author: teor teor@torproject.org Date: Tue Jun 11 14:48:52 2019 +1000

Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5

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