torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'ticket9176_squashed'

Browse Source 
Conflicts:
	doc/tor.1.txt
This commit is contained in:
Nick Mathewson
2014-03-05 14:32:05 -05:00
parent f0b2dc83b6 25374d307d
commit 103cebd924
5 changed files with 39 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/tor.1.txt
+6
View File
@@ -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.