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

[nickm at torproject.org]

commit 347b38d6d9dc73f0d14ff60ee8729550cea9a952
Merge: 04007557f e813116d3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 5 08:36:13 2018 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

 .travis.yml         | 4 ++--
 changes/ticket25714 | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)