Merge branch 'pr1870_squashed'

diff --cc src/core/or/channeltls.c
Simple merge

diff --cc src/lib/net/address.c
Simple merge

diff --cc src/lib/net/address.h
Simple merge