[tor-commits] [tor/maint-0.3.3] Merge branch 'travis_distcheck_031' into travis_distcheck_033

[nickm at torproject.org]

commit d5d312884f7d8d9a0212b12e954270b8b9f72258
Merge: bf466f550 f32ac2aaf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 18 18:37:59 2018 -0400

    Merge branch 'travis_distcheck_031' into travis_distcheck_033

 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)