commit 036e60aa6e05d703789233ba9caa35a31a02d1f0 Merge: 1fb2e46 546f5b3 Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 5 13:43:31 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

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