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

[nickm@xxxxxxxxxxxxxx]

commit 332c637f241d5253df34e6fb09f5a5c6bb2574d0
Merge: 1fd9d5e f6420bc
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Jul 5 13:43:31 2017 -0400

    Merge branch 'maint-0.2.6' into release-0.2.6

 changes/bug22789     | 6 ++++++
 src/common/compat.c  | 8 ++++++--
 src/test/test_addr.c | 9 +++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

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