[tor-commits] [tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1

[nickm at torproject.org]

commit 5434b2451e73bd4cd5eb62fb5e6c468eeee70153
Merge: 0f97f96 546f5b3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 5 13:43:31 2017 -0400

    Merge branch 'maint-0.3.0' into maint-0.3.1

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