commit 32c0066e4baa2ca16902a70b941d8d3afbc279ff Merge: bb97f68 5ff0f1a Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 5 13:43:21 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

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