From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 28 Nov 2012 03:18:16 +0000 (-0500)
Subject: Merge branch 'bug7013_take2_squashed'
X-Git-Tag: tor-0.2.4.7-alpha~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=190c1d4981e5751aabd3d894095851c830f1d570;p=thirdparty%2Ftor.git

Merge branch 'bug7013_take2_squashed'
---

190c1d4981e5751aabd3d894095851c830f1d570
diff --cc src/or/config.c
index 206ccc80d5,48e33b9c80..75f6193352
--- 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),