Merge branch 'ticket9176_squashed'

Conflicts:
	doc/tor.1.txt

diff --cc doc/tor.1.txt
index 370d0cbda20f465a9a63a50a0f31187bba54e789,a285dfd5b16f69461b1968ee0cff618acfbbfa25..bad8810c875b801a22dc194b17156f36b3796ee4
--- 1/doc/tor.1.txt
--- 2/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)

diff --cc src/or/config.c
Simple merge

diff --cc src/or/or.h
Simple merge

diff --cc src/or/rephist.c
Simple merge