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

[nickm@xxxxxxxxxxxxxx]

commit f794b40ec0056ae8642d995b3cbce04441ebe26e
Merge: 0ad5a6b03 af39c13a0
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Jul 26 15:39:55 2017 -0400

    Merge branch 'maint-0.2.5' into maint-0.2.6

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



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits