diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-11-29 18:30:41 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-11-29 18:30:41 -0500 |
| commit | da6c136817983e30349e9733891239b05aa66f09 (patch) | |
| tree | 5c5af254f33ddfdbf8f004410f00ea131b280880 /doc | |
| parent | 83f66db79ec6469beea0fb410be6536acb90ffd0 (diff) | |
| parent | 055d6c01fff3324dbb38c2d81ad49ccfdb5432c2 (diff) | |
| download | tor-da6c136817983e30349e9733891239b05aa66f09.tar tor-da6c136817983e30349e9733891239b05aa66f09.tar.gz | |
Merge remote-tracking branch 'asn-mytor/bug4548_take2'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 5e2a1e4e6..009ba412a 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -245,6 +245,12 @@ Other options can be specified either on the command-line (--option distinguishable from other users, because you won't believe the same authorities they do. +**DynamicPrimes** **0**|**1**:: + If this option is set to 1, use a dynamic Diffie-Hellman prime + modulus instead of using the modulus of Apache's mod_ssl. This + option might help circumvent censorship based on static + Diffie-Hellman parameters. (Default: 1). + **AlternateDirAuthority** [__nickname__] [**flags**] __address__:__port__ __fingerprint__ + **AlternateHSAuthority** [__nickname__] [**flags**] __address__:__port__ __fingerprint__ + |