aboutsummaryrefslogtreecommitdiffstats
path: root/doc/manual/tls.rst
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2016-10-24 12:38:42 -0400
committerJack Lloyd <[email protected]>2016-10-24 12:38:42 -0400
commit055a0bb4344f48397225acf903e8c21df2ffd724 (patch)
tree6778f0b5b19bc5bbf3ef7b58ce5214f49a3bc6c6 /doc/manual/tls.rst
parentbd663dbc98f35d45558db53f34b104f28ade0ddf (diff)
parentf44bd90a3ff9c2928eef825a0ff5394160b1a01c (diff)
Merge GH #673 X25519 TLS key exchange
Diffstat (limited to 'doc/manual/tls.rst')
-rw-r--r--doc/manual/tls.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/manual/tls.rst b/doc/manual/tls.rst
index 7ef61e63d..20546eb0b 100644
--- a/doc/manual/tls.rst
+++ b/doc/manual/tls.rst
@@ -590,7 +590,7 @@ policy settings from a file.
Return a list of ECC curves we are willing to use, in order of preference.
Default: "brainpool512r1", "secp521r1", "brainpool384r1",
- "secp384r1", "brainpool256r1", "secp256r1"
+ "secp384r1", "brainpool256r1", "secp256r1", "x25519"
No other values are currently defined.