diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-09-20 11:00:43 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-09-20 11:00:43 -0400 |
| commit | 07bb17185681f875be461c4fea6c661fae2dfde9 (patch) | |
| tree | 77c7e5eb273099e36593ff51cc329f94f425543b /doc | |
| parent | 0c807cf3e48cca5f4f93e8b1082bd62f2978cba4 (diff) | |
| parent | 39bb59d36322f3092bcb8c80c54ce4930dddef3a (diff) | |
| download | tor-07bb17185681f875be461c4fea6c661fae2dfde9.tar tor-07bb17185681f875be461c4fea6c661fae2dfde9.tar.gz | |
Merge branch 'no_client_timestamps_024_v2' into maint-0.2.4
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index d53ff2e69..ff760d41a 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1338,6 +1338,15 @@ The following options are useful only for clients (that is, if Tor will use a default value chosen by the directory authorities. (Default: -1.) +**Support022HiddenServices** **0**|**1**|**auto**:: + Tor hidden services running versions before 0.2.3.x required clients to + send timestamps, which can potentially be used to distinguish clients + whose view of the current time is skewed. If this option is set to 0, we + do not send this timestamp, and hidden services on obsolete Tor versions + will not work. If this option is set to 1, we send the timestamp. If + this optoin is "auto", we take a recommendation from the latest consensus + document. (Default: auto) + SERVER OPTIONS -------------- |