[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.6' into maint-0.2.7-redux

[nickm@xxxxxxxxxxxxxx]

commit c362c6a852d0c7a08d7abb28450a21975e42f55e
Merge: 5472066cd 0ad5a6b03
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Jul 26 15:35:01 2017 -0400

    Merge branch 'maint-0.2.6' into maint-0.2.7-redux

 .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