diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-01-11 09:28:09 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-01-11 09:28:09 -0500 |
| commit | 2c52061ab3122ad906c9c2155109139d6f46ff10 (patch) | |
| tree | 7518b49b1257da57a07a713559a859a56f14c88c /control-spec.txt | |
| parent | a129533e0ce7c530139cdbcbfa9e24e90f5dcc05 (diff) | |
| parent | e2f2974d6782de62fb423f8fca74eddefbc73d14 (diff) | |
| download | torspec-2c52061ab3122ad906c9c2155109139d6f46ff10.tar.gz torspec-2c52061ab3122ad906c9c2155109139d6f46ff10.zip | |
Merge remote-tracking branch 'jryans/dependant-corrected'
Diffstat (limited to 'control-spec.txt')
| -rw-r--r-- | control-spec.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/control-spec.txt b/control-spec.txt index 6d0d9a2..4ee1eb9 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -692,8 +692,11 @@ OptionName = Keyword OptionType = "Integer" / "TimeInterval" / "TimeMsecInterval" / "DataSize" / "Float" / "Boolean" / "Time" / "CommaList" / - "Dependant" / "Virtual" / "String" / "LineList" + "Dependent" / "Virtual" / "String" / "LineList" Documentation = Text + Note: The incorrect spelling "Dependant" was used from the time this key + was introduced in Tor 0.1.1.4-alpha until it was corrected in Tor + 0.3.0.2-alpha. It is recommended that clients accept both spellings. "config/defaults" A series of lines listing default values for each configuration |