commit d9663a25135ca676c1bd66f28f0db277a3764f65 Merge: fe2a9cb 5434b24 Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 5 13:43:31 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

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