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

[nickm at torproject.org]

commit 40456054eadf8a002de66d25cdf1400764a9f8af
Merge: f6890422a 4c6a407b9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 3 13:38:54 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

 .travis.yml | 4 +++-
 Makefile.am | 8 ++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)