commit fee094afcdd8589f29be82190acd73dbb60ee08b Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 22 15:07:01 2011 -0400

Fix issues in 3630 patch noted by Karsten --- src/or/connection.c | 10 +++++----- src/or/or.h | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/or/connection.c b/src/or/connection.c index 9dd9297..ad63a9d 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2388,10 +2388,10 @@ connection_bucket_init(void) } }

-/** Refill a single <b>bucket</b> called <b>name</b> with bandwidth rate - * per second <b>rate</b> and bandwidth burst per refill interval - * <b>burst</b>, assuming that <b>milliseconds_elapsed</b> milliseconds - * have passed since the last call. */ +/** Refill a single <b>bucket</b> called <b>name</b> with bandwidth rate per + * second <b>rate</b> and bandwidth burst <b>burst</b>, assuming that + * <b>milliseconds_elapsed</b> milliseconds have passed since the last + * call. */ static void connection_bucket_refill_helper(int *bucket, int rate, int burst, int milliseconds_elapsed, @@ -2449,7 +2449,7 @@ connection_bucket_refill(int milliseconds_elapsed, time_t now) connection_bucket_refill_helper(&global_write_bucket, bandwidthrate, bandwidthburst, milliseconds_elapsed, - "global_read_bucket"); + "global_write_bucket"); connection_bucket_refill_helper(&global_relayed_read_bucket, relayrate, relayburst, milliseconds_elapsed, diff --git a/src/or/or.h b/src/or/or.h index 37eea1c..b05c767 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3107,8 +3107,7 @@ typedef struct { * log whether it was DNS-leaking or not? */ int HardwareAccel; /**< Boolean: Should we enable OpenSSL hardware * acceleration where available? */ - /** Token Bucket Refill resolution in milliseconds (ignored when - * bufferevents are enabled) */ + /** Token Bucket Refill resolution in milliseconds. */ int TokenBucketRefillInterval; char *AccelName; /**< Optional hardware acceleration engine name. */ char *AccelDir; /**< Optional hardware acceleration engine search dir. */