[tor-commits] [tor/master] Merge remote-tracking branch 'catalyst-github/bug26449_034' into maint-0.3.4

[nickm at torproject.org]

commit cd2be4283c8b4f8543649b067f198e7cf43652c1
Merge: bfcfeaed0 81e6c53a3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 2 13:38:40 2018 -0400

    Merge remote-tracking branch 'catalyst-github/bug26449_034' into maint-0.3.4

 .travis.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)