Commit 70910479 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge remote-tracking branch 'public/bug5598' 

Conflicts:
	doc/tor.1.txt

Conflict was on a formatting issue in the manpage.
parents a6180b7f 8a341cc4

changes/bug5598

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  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.

doc/tor.1.txt

+1 −1
Original line number Diff line number Diff line
@@ -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__ +

src/or/config.c

+1 −1
Original line number Diff line number Diff line
@@ -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"),