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

[nickm at torproject.org]

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

    Merge branch 'maint-0.2.6' into release-0.2.6

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