[tor-commits] [tor/master] Lower the maximum for PrecictedCircsRelevanceTime to one hour

[nickm at torproject.org]

commit 2c25bb413ec44257a8b8692958a348aaa6553c8c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 5 14:25:38 2014 -0500

    Lower the maximum for PrecictedCircsRelevanceTime to one hour
---
 doc/tor.1.txt   |    6 ++++--
 src/or/config.c |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index d9ff4ee..a285dfd 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -524,8 +524,10 @@ GENERAL OPTIONS
     \'info'. (Default: 0)
 
 **PredictedCircsRelevanceTime** __NUM__::
-    Set how long, after having requested a connection to a given port, we will
-    search for exits that support that port. (Default: 1 hour)
+    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**::
     If 1, Tor forks and daemonizes to the background. This option has no effect
diff --git a/src/or/config.c b/src/or/config.c
index db111b5..0529714 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2388,7 +2388,7 @@ compute_publishserverdescriptor(or_options_t *options)
 /** Higest allowable value for PredictedCircsRelevanceTime; if this is
  * too high, our selection of exits will decrease for an extended
  * period of time to an uncomfortable level .*/
-#define MAX_PREDICTED_CIRCS_RELEVANCE (24*60*60)
+#define MAX_PREDICTED_CIRCS_RELEVANCE (60*60)
 
 /** Highest allowable value for RendPostPeriod. */
 #define MAX_DIR_PERIOD (MIN_ONION_KEY_LIFETIME/2)