diff options
| author | Roger Dingledine <arma@torproject.org> | 2006-10-01 18:29:10 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2006-10-01 18:29:10 +0000 |
| commit | 89fd4fdbe28dd063f846752939f3f0530b6973e3 (patch) | |
| tree | 9a1c413c79eba03d120991dfcf0ae57bf73dfafd | |
| parent | cc3a7c5f72e6ff37ec8a8be4ae6ffd983c15e6b2 (diff) | |
| download | tor-89fd4fdbe28dd063f846752939f3f0530b6973e3.tar.gz tor-89fd4fdbe28dd063f846752939f3f0530b6973e3.zip | |
backport 8550 too.
svn:r8565
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/or/rephist.c | 4 |
2 files changed, 7 insertions, 5 deletions
@@ -5,9 +5,11 @@ Changes in version 0.1.1.25 - 2006-10-?? [ongoing] 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 diff --git a/src/or/rephist.c b/src/or/rephist.c index 8caad25ce4..1479390799 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -905,9 +905,9 @@ rep_hist_get_predicted_internal(time_t now, int *need_uptime, } 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; } |