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

[nickm at torproject.org]

commit de4f461a0bee632da8dae667b21db7f3711cf795
Merge: fa2d613 32c0066
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 5 13:43:31 2017 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

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