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

[nickm at torproject.org]

commit 7021d33b91a3fe4a4d90ad660db4bba5642769f7
Merge: cc4c1840a f17f7a4fd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 26 15:39:56 2017 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.0

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