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

[nickm at torproject.org]

commit 1d281eb933d6cf51d8a488bface6bf3f0a963f4f
Merge: 0d63a6064 0eb2cdf99
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 19 05:42:43 2018 -0400

    Merge branch 'maint-0.2.5' into release-0.2.5

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