[tor-commits] [tor/master] Merge branch 'tor-github/pr/941'

[asn at torproject.org]

commit 9ae267538ce09569ecdba88d5fb1381ec197bb54
Merge: 3f9efc5e8 8ff6ab0a3
Author: George Kadianakis <desnacked at riseup.net>
Date:   Mon Apr 15 13:57:40 2019 +0300

    Merge branch 'tor-github/pr/941'

 .travis.yml         | 2 +-
 changes/ticket30117 | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)