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

[nickm at torproject.org]

commit 6cd6d488dc2469df82d74f0fcc3c84f5b45e8447
Merge: 9a0fd2d f6420bc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 5 13:42:37 2017 -0400

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

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