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

[nickm at torproject.org]

commit 7f629f7fd9e6e5fe04367e611eae48f8f2bad81a
Merge: 667e66bb0 4c6a407b9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 3 13:38:54 2018 -0400

    Merge branch 'maint-0.3.3'

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