diff options
| author | Roger Dingledine <arma@torproject.org> | 2010-01-15 15:58:35 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2010-01-15 15:58:35 -0500 |
| commit | b9f1bd3c4e665e90ad6f7cb6d34a687d635fe2cb (patch) | |
| tree | 5857d2e2a0b1064b3129cc7be1601f86009f24d2 | |
| parent | f1d74f611d57ab87f8e408aa23a73fd9552e95c9 (diff) | |
| download | tor-b9f1bd3c4e665e90ad6f7cb6d34a687d635fe2cb.tar.gz tor-b9f1bd3c4e665e90ad6f7cb6d34a687d635fe2cb.zip | |
whitespace fixes
| -rw-r--r-- | doc/spec/dir-spec.txt | 8 | ||||
| -rw-r--r-- | src/or/connection.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/spec/dir-spec.txt b/doc/spec/dir-spec.txt index e1a83547e1..19a32027af 100644 --- a/doc/spec/dir-spec.txt +++ b/doc/spec/dir-spec.txt @@ -1433,10 +1433,10 @@ per second, and capped at some arbitrary value (currently 10 MB/s). The Measured= keyword on a "w" line vote is currently computed - by multiplying the previous published consensus bandwidth by the - ratio of the measured average node stream capacity to the network - average. If 3 or more authorities provide a Measured= keyword for - a router, the authorities produce a consensus containing a "w" + by multiplying the previous published consensus bandwidth by the + ratio of the measured average node stream capacity to the network + average. If 3 or more authorities provide a Measured= keyword for + a router, the authorities produce a consensus containing a "w" Bandwidth= keyword equal to the median of the Measured= votes. The ports listed in a "p" line should be taken as those ports for diff --git a/src/or/connection.c b/src/or/connection.c index fe205f4433..667e7dcf97 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2261,7 +2261,7 @@ connection_bucket_refill(int seconds_elapsed, time_t now) if (conn->write_blocked_on_bw == 1 && global_write_bucket > 0 /* and we're allowed to write */ && (!connection_counts_as_relayed_traffic(conn, now) || - global_relayed_write_bucket > 0) /* even if we're relayed traffic */ + global_relayed_write_bucket > 0) /* even if it's relayed traffic */ && (!connection_speaks_cells(conn) || conn->state != OR_CONN_STATE_OPEN || TO_OR_CONN(conn)->write_bucket > 0)) { |