[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

[nickm at torproject.org]

commit 8664f76dd202ec6514c06207c37fe9ae340f2f0f
Merge: ea3c3a10a 85cd8386f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 24 10:38:37 2018 -0400

    Merge branch 'maint-0.3.3'

 .travis.yml              | 7 ++++++-
 changes/travis_distcheck | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)