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

[nickm at torproject.org]

commit 0331e287741e53277ba9a444644cb71a711f395d
Merge: 6a36221 0ee15c9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 5 13:43:31 2017 -0400

    Merge branch 'maint-0.2.4' into release-0.2.4

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