Merge remote-tracking branch 'public/bug4645'

changes/ticket4645

src/common/address.c

src/common/address.h

src/or/config.c

src/or/directory.c

src/or/dirserv.c

src/test/test_addr.c