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

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

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

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

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

diff --cc src/or/config.c
index f0686dae4ca892bf7fce63e8ea7c960fe3094fb5,06914b62af9927371321861e1a591359bcf36104..ab991a4f6e9f5a634782bedc03d9f68c096f8043
--- 1/src/or/config.c
--- 2/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"),

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

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

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

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