[tor-commits] [tor/master] Merge remote-tracking branch 'asn-mytor/bug4548_take2'

[nickm at torproject.org]

commit da6c136817983e30349e9733891239b05aa66f09
Merge: 83f66db 055d6c0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 29 18:30:41 2011 -0500

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

 changes/bug4548     |    6 +
 doc/tor.1.txt       |    6 +
 src/common/crypto.c |  303 +++++++++++++++++++++++++++++++++++++++++++++++----
 src/common/crypto.h |    2 +
 src/common/util.c   |   42 +++++---
 src/common/util.h   |    3 +
 src/or/config.c     |   49 ++++++++
 src/or/main.c       |    5 +-
 src/or/or.h         |    2 +
 src/or/router.c     |   21 ++--
 src/or/router.h     |    1 +
 11 files changed, 391 insertions(+), 49 deletions(-)

diff --cc src/or/config.c
index f0686da,06914b6..ab991a4
--- 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"),