[or-cvs] r8565: backport 8550 too. (in tor/branches/tor-0_1_1-patches: . src/or)

[arma at seul.org]

Author: arma
Date: 2006-10-01 14:29:10 -0400 (Sun, 01 Oct 2006)
New Revision: 8565

Modified:
   tor/branches/tor-0_1_1-patches/ChangeLog
   tor/branches/tor-0_1_1-patches/src/or/rephist.c
Log:
backport 8550 too.


Modified: tor/branches/tor-0_1_1-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_1-patches/ChangeLog	2006-10-01 18:22:22 UTC (rev 8564)
+++ tor/branches/tor-0_1_1-patches/ChangeLog	2006-10-01 18:29:10 UTC (rev 8565)
@@ -5,11 +5,13 @@
       Previously, we would give them no answer at all.
 
   o Minor bugfixes:
-    - Avoid a memory corruption bug when creating a hash table for the first
-      time.
+    - Avoid a memory corruption bug when creating a hash table for
+      the first time.
+    - We were building exactly the wrong circuits when we anticipated
+      hidden service requirements, meaning Tor would have to build all
+      its circuits on demand.
 
 
-
 Changes in version 0.1.1.24 - 2006-09-29
   o Major bugfixes:
     - Allow really slow clients to not hang up five minutes into their

Modified: tor/branches/tor-0_1_1-patches/src/or/rephist.c
===================================================================
--- tor/branches/tor-0_1_1-patches/src/or/rephist.c	2006-10-01 18:22:22 UTC (rev 8564)
+++ tor/branches/tor-0_1_1-patches/src/or/rephist.c	2006-10-01 18:29:10 UTC (rev 8565)
@@ -905,9 +905,9 @@
   }
   if (predicted_internal_time + PREDICTED_CIRCS_RELEVANCE_TIME < now)
     return 0; /* too long ago */
-  if (predicted_internal_uptime_time + PREDICTED_CIRCS_RELEVANCE_TIME < now)
+  if (predicted_internal_uptime_time + PREDICTED_CIRCS_RELEVANCE_TIME >= now)
     *need_uptime = 1;
-  if (predicted_internal_capacity_time + PREDICTED_CIRCS_RELEVANCE_TIME < now)
+  if (predicted_internal_capacity_time + PREDICTED_CIRCS_RELEVANCE_TIME >= now)
     *need_capacity = 1;
   return 1;
 }