Merge branch 'bug7013_take2_squashed'

changes/bug7013

doc/tor.1.txt

src/common/address.c

src/common/address.h

src/or/config.c

src/or/config.h

src/or/or.h

src/or/statefile.c

src/test/test_addr.c