diff options
author | Nick Mathewson <nickm@torproject.org> | 2013-10-31 14:02:28 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2013-10-31 14:02:28 -0400 |
commit | 1b312f7b55bc5322f3029ad12715d9f348d44650 (patch) | |
tree | 9b99d209095d88a1338774ea1a212add2df9b927 /doc | |
parent | 0e8ee795d901c1a5ac84e53bbea417fddace46bf (diff) | |
parent | 72c1e5acfe1c6f04f4d7d398fc4a964d4bc5b62e (diff) | |
download | tor-1b312f7b55bc5322f3029ad12715d9f348d44650.tar tor-1b312f7b55bc5322f3029ad12715d9f348d44650.tar.gz |
Merge remote-tracking branch 'public/bug9780_024_v2' into maint-0.2.4
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 0e7f088c9..b9ee29614 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1646,7 +1646,7 @@ is non-zero): What EC group should we try to use for incoming TLS connections? P224 is faster, but makes us stand out more. Has no effect if we're a client, or if our OpenSSL version lacks support for ECDHE. - (Default: P224 for public servers; P256 for bridges.) + (Default: P256) [[CellStatistics]] **CellStatistics** **0**|**1**:: When this option is enabled, Tor writes statistics on the mean time that |