summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-10-28 11:15:21 -0400
committerNick Mathewson <nickm@torproject.org>2016-12-08 16:47:58 -0500
commit9e840e6c7d10a3dfa188d2186ce3c67ca1d698f5 (patch)
tree9361f0c7dc0663997200df0366bac68984916afd /doc
parent6788418f28930467121537f31c4b43f981ae6ca8 (diff)
downloadtor-9e840e6c7d10a3dfa188d2186ce3c67ca1d698f5.tar.gz
tor-9e840e6c7d10a3dfa188d2186ce3c67ca1d698f5.zip
Add ExtendByEd25519ID consensus parameter/torrc option
I need to be able to turn on Ed25519 support in client generation of extend cells so I can test it, but leave it off-by-default until enough clients support it for us to turn it on for a bunch at once. This is part of #15056 / prop#220.
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index cbc7ac181e..1071168441 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -717,6 +717,13 @@ GENERAL OPTIONS
127.0.0.1 or 10.0.0.1. This is mostly useful for debugging
rate-limiting. (Default: 0)
+[[ExtendByEd25519ID]] **ExtendByEd25519ID** **0**|**1**|**auto**::
+ If this option is set to 1, we always try to include a relay's Ed25519 ID
+ when telling the proceeding relay in a circuit to extend to it.
+ If this option is set to 0, we never include Ed25519 IDs when extending
+ circuits. If the option is set to "default", we obey a
+ parameter in the consensus document. (Default: auto)
+
CLIENT OPTIONS
--------------