commit 9c96dbe7b01a5415fd070f4901f4125b20c29dfc Merge: e6d7752 ff8c230 Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 5 13:43:31 2017 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

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