Merge remote-tracking branch 'public/bug5598'

Conflicts:
	doc/tor.1.txt

Conflict was on a formatting issue in the manpage.

3 files changed, 7 insertions, 2 deletions

diff --git a/changes/bug5598 b/changes/bug5598
new file mode 100644
index 0000000000..e8e67415bd
--- /dev/null
+++ b/changes/bug5598
@@ -0,0 +1,5 @@
+  o Changed defaults:
+    - Change the default value for DynamicDHGroups to 0. This feature can
+      make Tor relays less identifiable by their use of the mod_ssl DH
+      group, but at the cost of some usability (#4721) and bridge tracing
+      (#6087) regressions. Resolves ticket #5598.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 3e7541b2a0..78a33ca793 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -266,7 +266,7 @@ Other options can be specified either on the command-line (--option
     If this option is set to 1, when running as a server, generate our
     own Diffie-Hellman group instead of using the one from Apache's mod_ssl.
     This option may help circumvent censorship based on static
-    Diffie-Hellman parameters. (Default: 1)
+    Diffie-Hellman parameters. (Default: 0)
 
 **AlternateDirAuthority** [__nickname__] [**flags**] __address__:__port__ __fingerprint__ +
 
diff --git a/src/or/config.c b/src/or/config.c
index 2e3ce6429d..1fc5806f11 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -257,7 +257,7 @@ static config_var_t _option_vars[] = {
   V(DisableAllSwap,              BOOL,     "0"),
   V(DisableDebuggerAttachment,   BOOL,     "1"),
   V(DisableIOCP,                 BOOL,     "1"),
-  V(DynamicDHGroups,             BOOL,     "1"),
+  V(DynamicDHGroups,             BOOL,     "0"),
   V(DNSPort,                     LINELIST, NULL),
   V(DNSListenAddress,            LINELIST, NULL),
   V(DownloadExtraInfo,           BOOL,     "0"),