commit bcfab63ca5713638cc2155a8870e51657a2a0ef2 Merge: b8a2bdbdc d0965561a Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 6 09:24:47 2018 -0400

Merge remote-tracking branch 'teor/ticket27467'

changes/ticket27467 | 3 +++ src/lib/net/address.c | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-)