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

[nickm at torproject.org]

commit 65fd973754592bb279e1b66ce226eb3e8362b815
Merge: 677789b68 f0230ee38
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 17 10:48:18 2018 -0400

    Merge branch 'maint-0.3.2' into release-0.3.2

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