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

[nickm at torproject.org]

commit f0230ee38a5031d447758259245a5121ec7e4789
Merge: c5899d5cf ce8e7427b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 17 10:48:18 2018 -0400

    Merge branch 'maint-0.3.1' into maint-0.3.2

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