diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-04-01 13:46:50 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-04-01 13:46:50 -0400 |
| commit | cd8f13b5cb0f91731653eba1adf0cc3ba597db6d (patch) | |
| tree | 1c4156e29f5a69586cfe4bbbc8f11d865472f849 /doc | |
| parent | aa7b7922505ef8dfab6df49f5537ffba92322b09 (diff) | |
| parent | 840c11b14e673abaa64ae3ba8dc1efcc92a2da27 (diff) | |
| download | tor-cd8f13b5cb0f91731653eba1adf0cc3ba597db6d.tar.gz tor-cd8f13b5cb0f91731653eba1adf0cc3ba597db6d.zip | |
Merge branch 'bug13736'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index a77cb9b169..ed7cff9866 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -371,12 +371,6 @@ GENERAL OPTIONS chosen with their regular weights, multiplied by this number, which should be 1.0 or less. (Default: 1.0) -[[DynamicDHGroups]] **DynamicDHGroups** **0**|**1**:: - 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: 0) - [[AlternateDirAuthority]] **AlternateDirAuthority** [__nickname__] [**flags**] __address__:__port__ __fingerprint__ + [[AlternateBridgeAuthority]] **AlternateBridgeAuthority** [__nickname__] [**flags**] __address__:__port__ __ fingerprint__:: |