Merge branch 'bug7013_take2_squashed'

diff --cc doc/tor.1.txt
Simple merge

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

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

diff --cc src/or/config.c
index 206ccc80d5bd7cd120537feb74c3d8296d90fc0a,48e33b9c80034cd24c5125eef3a5185cd0749fb2..75f6193352b6174684dd16f0edd1d1e2bad9f294
--- 1/src/or/config.c
--- 2/src/or/config.c
+++ b/src/or/config.c
@@@ -276,8 -272,8 +276,9 @@@ static config_var_t option_vars_[] = 
    V(HTTPProxyAuthenticator,      STRING,   NULL),
    V(HTTPSProxy,                  STRING,   NULL),
    V(HTTPSProxyAuthenticator,     STRING,   NULL),
 +  V(IPv6Exit,                    BOOL,     "0"),
    VAR("ServerTransportPlugin",   LINELIST, ServerTransportPlugin,  NULL),
+   V(ServerTransportListenAddr,   LINELIST, NULL),
    V(Socks4Proxy,                 STRING,   NULL),
    V(Socks5Proxy,                 STRING,   NULL),
    V(Socks5ProxyUsername,         STRING,   NULL),

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

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

diff --cc src/test/test_addr.c
Simple merge