commit 13d0855a893a46a0f6dc06dc7d983ea321f7206a Merge: b9103c38c 3b6d1676e Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 7 10:29:45 2018 -0400

Merge remote-tracking branch 'teor/bug27521'

src/lib/net/address.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)