commit fd0961ce6be4fef6201e3e239c9e633e0c8061da Merge: 56e81bdde a08e6e711 Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 7 08:42:19 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

changes/bug27465 | 5 +++++ src/common/address.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-)