[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

[nickm at torproject.org]

commit 677789b680763d18ac1e81815b838ec32f3a37d0
Merge: a6f21a61d c5899d5cf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 16 13:48:23 2018 -0400

    Merge branch 'maint-0.3.2' into release-0.3.2

 src/common/address.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)