diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-06-11 10:26:48 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-06-11 10:26:48 -0400 |
| commit | 70910479e383806b98f15490abc5e45ceb1066d5 (patch) | |
| tree | 22592fbb26bccc609196d1ac7adb052865e7458f /doc | |
| parent | a6180b7f290c52b03f8abe3caf2ce233399dd66f (diff) | |
| parent | 8a341cc429879e642862cb16a9de5da889867020 (diff) | |
| download | tor-70910479e383806b98f15490abc5e45ceb1066d5.tar.gz tor-70910479e383806b98f15490abc5e45ceb1066d5.zip | |
Merge remote-tracking branch 'public/bug5598'
Conflicts:
doc/tor.1.txt
Conflict was on a formatting issue in the manpage.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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__ + |