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

[nickm at torproject.org]

commit 0c44446c4023141ab516d81fc244520bf8ee20fc
Merge: d1340423f af39c13a0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 26 15:39:55 2017 -0400

    Merge branch 'maint-0.2.5' into release-0.2.5

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