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

[nickm at torproject.org]

commit 7d1d868ea0ed2cacd845677a86b4ddb813962ee1
Merge: e212c752f 49de586ad
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 19 10:18:59 2018 -0500

    Merge branch 'maint-0.2.5' into release-0.2.5

 .travis.yml | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)