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

[nickm at torproject.org]

commit 7a55efbd597ccc32f61234ad45abc96aa73521e4
Merge: 31e69ac22 89a3fafd4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 24 10:38:37 2018 -0400

    Merge branch 'maint-0.3.2' into release-0.3.2

 .travis.yml              | 5 ++++-
 changes/travis_distcheck | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)