diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-03-05 14:32:05 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-03-05 14:32:05 -0500 |
| commit | 103cebd9243367106909251e73ee97aafe9d201c (patch) | |
| tree | d0e3b8328531a0e283cda1075a33910e467a7410 /doc | |
| parent | f0b2dc83b60b0de1644ce9fb5e19fef516e9ffde (diff) | |
| parent | 25374d307d5fc0731eb116dc8e9840bfbbff9167 (diff) | |
| download | tor-103cebd9243367106909251e73ee97aafe9d201c.tar tor-103cebd9243367106909251e73ee97aafe9d201c.tar.gz | |
Merge branch 'ticket9176_squashed'
Conflicts:
doc/tor.1.txt
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 370d0cbda..bad8810c8 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -544,6 +544,12 @@ GENERAL OPTIONS following the Tor specification. Otherwise, they are logged with severity \'info'. (Default: 0) +[[PredictedCircsRelevanceTime]] **PredictedCircsRelevanceTime** __NUM__:: + Set how long, after the client has mad an anonymized connection to a + given port, we will try to make sure that we build circuits to + exits that support that port. The maximum value for this option is 1 + hour. (Default: 1 hour) + [[RunAsDaemon]] **RunAsDaemon** **0**|**1**:: If 1, Tor forks and daemonizes to the background. This option has no effect on Windows; instead you should use the --service command-line option. |