Merge branch 'bug18105'

diff --cc src/common/address.c
Simple merge

diff --cc src/common/compat.c
Simple merge

diff --cc src/or/connection.c
Simple merge