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

[teor at torproject.org]

commit a58c4cc6dd905acb5ab5c29c0152e792b27dd428
Merge: cb20054cc 9a97b5ff5
Author: teor <teor at torproject.org>
Date:   Tue Jun 11 14:47:40 2019 +1000

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

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