From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 29 Nov 2011 23:30:41 +0000 (-0500)
Subject: Merge remote-tracking branch 'asn-mytor/bug4548_take2'
X-Git-Tag: tor-0.2.3.9-alpha~40
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=da6c136817983e30349e9733891239b05aa66f09;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'asn-mytor/bug4548_take2'
---

da6c136817983e30349e9733891239b05aa66f09
diff --cc src/or/config.c
index f0686dae4c,06914b62af..ab991a4f6e
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -247,8 -246,8 +247,9 @@@ static config_var_t _option_vars[] = 
    V(DirReqStatistics,            BOOL,     "1"),
    VAR("DirServer",               LINELIST, DirServers, NULL),
    V(DisableAllSwap,              BOOL,     "0"),
 +  V(DisableDebuggerAttachment,   BOOL,     "1"),
    V(DisableIOCP,                 BOOL,     "1"),
+   V(DynamicDHGroups,             BOOL,     "1"),
    V(DNSPort,                     LINELIST, NULL),
    V(DNSListenAddress,            LINELIST, NULL),
    V(DownloadExtraInfo,           BOOL,     "0"),