commit 4d0abd1b9b0478a8b25cf4b789fe371eea69f952 Merge: 444fd5704 b6de39e5f Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 7 08:42:19 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

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