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

[nickm at torproject.org]

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

    Merge branch 'maint-0.2.4' into release-0.2.4

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