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

[nickm at torproject.org]

commit 4953efec39b6902cf1cd4d7b741d716df0361c82
Merge: e8fdac775 36567c5ca
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 19 10:18:59 2018 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

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