[tor-commits] [tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/971' into maint-0.4.0

[nickm at torproject.org]

commit 851e881f01355b0290e79100c09dbedd425f8946
Merge: a56d7e37a 9a97b5ff5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 5 16:12:07 2019 -0400

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

 .travis.yml         | 1 +
 changes/ticket30234 | 2 ++
 2 files changed, 3 insertions(+)