Merge branch 'bug7555_v2_squashed'

changes/bug14193

changes/bug14259

changes/bug7555

src/or/addressmap.c

src/or/addressmap.h

src/or/connection_edge.c

src/or/connection_edge.h

src/test/include.am

src/test/test.c

src/test/test_config.c

src/test/test_entryconn.c