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

[nickm@xxxxxxxxxxxxxx]

commit d1340423faacb43884fc42d75e8ed8477fe5c7e1
Merge: e4d7f97c4 09618bc48
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Jul 26 15:38:48 2017 -0400

    Merge branch 'maint-0.2.5' into release-0.2.5

 .travis.yml      | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 changes/bug22636 |  8 ++++++
 2 files changed, 96 insertions(+)

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