From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 5 Mar 2014 19:32:05 +0000 (-0500)
Subject: Merge branch 'ticket9176_squashed'
X-Git-Tag: tor-0.2.5.3-alpha~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=103cebd9243367106909251e73ee97aafe9d201c;p=thirdparty%2Ftor.git

Merge branch 'ticket9176_squashed'

Conflicts:
	doc/tor.1.txt
---

103cebd9243367106909251e73ee97aafe9d201c
diff --cc doc/tor.1.txt
index 370d0cbda2,a285dfd5b1..bad8810c87
--- 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)