diff --git a/ChangeLog b/ChangeLog index 5d8edd1bb..ba336154a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,11 @@ Changes in version 0.2.0.32 - 2008-??-?? port 80, we would previously reject the connection. Now, we assume the user knows what they were asking for. Fixes bug 752. Bugfix on 0.0.9rc5. Diagnosed by BarkerJr. + - If we overrun our per-second write limits a little, count this as + having used up our write allocation for the second, and choke outgoing + directory writes. Previously, we had only counted this when we + had met our limits precisely. Fixes bug 824. Patch from by rovv. + Bugfix on 0.2.0.x (??). Changes in version 0.2.0.31 - 2008-09-03 diff --git a/src/or/connection.c b/src/or/connection.c index 8c7b6a5dd..630ef6f8b 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1718,7 +1718,7 @@ connection_bucket_refill(int seconds_elapsed, time_t now) tor_assert(seconds_elapsed >= 0); write_buckets_empty_last_second = - global_relayed_write_bucket == 0 || global_write_bucket == 0; + global_relayed_write_bucket <= 0 || global_write_bucket <= 0; /* refill the global buckets */ connection_bucket_refill_helper(&global_read_bucket,