commit 0832f1cb8fbe6ddbaaef25f2152548f0f647aa8e Merge: a8fcb6a 6cd6d48 Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 5 13:43:31 2017 -0400

Merge branch 'maint-0.2.7-redux' into release-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(-)