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

[nickm at torproject.org]

commit 02ac1822abe329fee343bdab145e4bacfcfc76fe
Merge: ae0ee0202 ce8e7427b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 17 10:48:17 2018 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

 .travis.yml       | 9 ++++++++-
 changes/coveralls | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)