[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.4' into maint-0.2.5

[nickm at torproject.org]

commit af39c13a0385c9c61b3a7ffdd6362d2f86e3f44b
Merge: 09618bc48 ebb441ded
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 26 15:39:55 2017 -0400

    Merge branch 'maint-0.2.4' into maint-0.2.5

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