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

[nickm at torproject.org]

commit 3370b3cfef62cba8377285d95b232f810edde504
Merge: 67a313f0e 0eb2cdf99
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 19 05:42:43 2018 -0400

    Merge branch 'maint-0.2.5' into maint-0.2.9

 .travis.yml | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)