[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

[nickm at torproject.org]

commit ddd66cc01911da301ef61813c951418996c19593
Merge: c362c6a85 f794b40ec
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 26 15:39:55 2017 -0400

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

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