Apply rovv's fix for bug 824.

svn:r16975

2 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index c3726af54..e90fefa97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,7 @@ Changes in version 0.2.1.6-alpha - 2008-09-xx
       unable to send INTRODUCE cells to the service, or even (depending
       on the type of authentication) to learn introduction points.  This
       feature raises the bar for certain kinds of active attacks against
-      hidden services.
+      hidden services.  Code by Karsten Loesing.
     - Relays now store and serve v2 hidden service descriptors by default
       (i.e. new default value for HidServDirectoryV2 is 1). This is the
       last step in proposal 114, which aims to make hidden service
@@ -61,6 +61,11 @@ Changes in version 0.2.1.6-alpha - 2008-09-xx
       on 0.0.9rc5. Diagnosed by BarkerJr.
     - If we are not using BEGIN_DIR cells, don't attempt to contact hidden
       service directories with non-open dir port. Bugfix on 0.2.0.10-alpha.
+    - 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 (??).
 
   o Minor features:
     - Update to the "September 1 2008" ip-to-country file.
diff --git a/src/or/connection.c b/src/or/connection.c
index 963c64e5b..b27e8d26b 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1827,7 +1827,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,