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

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.1' into release-0.3.1

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