commit 0ee15c92d5486fc73ba49dea7f12bf2f89012cfb Merge: d56f699 bb3f74e Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 5 13:41:27 2017 -0400

Merge branch 'bug22789_024' into maint-0.2.4

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