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

[nickm at torproject.org]

commit 9ef4c05df8323850b5894782f435da15810d6189
Merge: 22845df2a c5899d5cf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 16 13:48:23 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

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