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

[nickm at torproject.org]

commit 5ff0f1ab9e3a0b82b177b3f710201d0ad35b69c4
Merge: 3483f7c 6cd6d48
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 5 13:42:47 2017 -0400

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

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