commit 0a2b96cae63cc4eb5d24751ccc0b44501128090e Merge: 4973ceb46 b05b165a7 Author: Nick Mathewson nickm@torproject.org Date: Thu May 2 08:36:09 2019 -0400

Merge remote-tracking branch 'tor-github/pr/989'

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