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

[nickm at torproject.org]

commit be5b4415c2dce243a6249e6ca14b65423c9b0746
Merge: 246765342 6361a250f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 3 13:38:54 2018 -0400

    Merge branch 'maint-0.3.1' into maint-0.3.2

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