[tor-commits] [tor/master] Merge branch 'bug7013_take2_squashed'

[nickm at torproject.org]

commit 190c1d4981e5751aabd3d894095851c830f1d570
Merge: 267c0e5 6f21d2e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 27 22:18:16 2012 -0500

    Merge branch 'bug7013_take2_squashed'

 changes/bug7013      |    4 ++
 doc/tor.1.txt        |    5 +++
 src/common/address.c |   41 +++++++++++++++++++++-
 src/common/address.h |    3 ++
 src/or/config.c      |   94 ++++++++++++++++++++++++++++++++++++++++++++++++++
 src/or/config.h      |    2 +
 src/or/or.h          |    3 ++
 src/or/statefile.c   |   11 +++++-
 src/test/test_addr.c |   53 ++++++++++++++++++++++++++++
 9 files changed, 214 insertions(+), 2 deletions(-)

diff --cc src/or/config.c
index 206ccc8,48e33b9..75f6193
--- a/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),