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

[nickm at torproject.org]

commit 5c5eb0f095c2744e8717f613a6edcc8d118f163a
Merge: fbf93614c ddd66cc01
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 26 15:39:55 2017 -0400

    Merge branch 'maint-0.2.7-redux' into maint-0.2.8

 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)