[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/971'

[nickm at torproject.org]

commit 6559aefc7b34529aac501080901c3d2923cbd2bf
Merge: b0459de21 9a97b5ff5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 23 12:52:54 2019 -0400

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

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