commit 5b5abd8c038b88cba7078a105b0896cd151ee509 Merge: a1019b8 110765f Author: Nick Mathewson nickm@torproject.org Date: Fri Jan 8 15:08:28 2016 -0800

Merge commit '110765f5564a588c5f019d32b5e6f66cc7806c41'

changes/feature17951 | 6 ++++++ src/common/address.c | 33 +++++++++++++++++++++++---------- 2 files changed, 29 insertions(+), 10 deletions(-)