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

[nickm at torproject.org]

commit 36567c5ca4a1f9800415c772c87ee17dfba8d75d
Merge: 9464da210 49de586ad
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 19 10:16:47 2018 -0500

    Merge branch 'maint-0.2.5' into maint-0.2.9

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