commit 103cebd9243367106909251e73ee97aafe9d201c Merge: f0b2dc8 25374d3 Author: Nick Mathewson nickm@torproject.org Date: Wed Mar 5 14:32:05 2014 -0500

Merge branch 'ticket9176_squashed'

Conflicts: doc/tor.1.txt

changes/ticket9176 | 4 ++++ doc/tor.1.txt | 6 ++++++ src/or/config.c | 13 +++++++++++++ src/or/or.h | 4 ++++ src/or/rephist.c | 20 ++++++++++++-------- 5 files changed, 39 insertions(+), 8 deletions(-)

diff --cc doc/tor.1.txt index 370d0cb,a285dfd..bad8810 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@@ -544,7 -523,13 +544,13 @@@ GENERAL OPTION following the Tor specification. Otherwise, they are logged with severity 'info'. (Default: 0)

-**PredictedCircsRelevanceTime** __NUM__:: ++[[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** **0**|**1**:: +[[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. (Default: 0)