Merge remote-tracking branch 'public/bug12509_025'

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

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

diff --cc src/or/or.h
Simple merge