commit d63c17f2afb810f5db896b10909fe9ff2bfe7cf9 Merge: e51b57ee0 b05b165a7 Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 5 16:22:29 2019 -0400

Merge remote-tracking branch 'tor-github/pr/989' into maint-0.4.0

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