commit f6420bceec9707324fe23c98a2a70dd2612f183f Merge: 3de2761 ff8c230 Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 5 13:42:32 2017 -0400

Merge branch 'maint-0.2.5' into maint-0.2.6

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