aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--doc/TODO2
-rw-r--r--src/or/circuitbuild.c6
3 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index d3e6db878f..d8f5f8e110 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,8 +5,12 @@ Changes in version 0.2.0.13-alpha - 2007-12-??
two new guards on startup (bugfix on 0.2.0.9-alpha), and it was
causing us to discard all our guards on startup if we hadn't been
running for a few weeks (bugfix on 0.1.2.x). Fixes bug 448.
- - Start purging old entries from the "rephist" database, and the
- hidden service descriptor databases, even when DirPort is zero.
+ - Purge old entries from the "rephist" database and the hidden
+ service descriptor databases even when DirPort is zero. Bugfix
+ on 0.1.2.x.
+ - We were ignoring our RelayBandwidthRate for the first 30 seconds
+ after opening a circuit -- even relayed circuits. Bugfix on
+ 0.2.0.3-alpha.
o Minor bugfixes:
- The fix in 0.2.0.12-alpha cleared the "hsdir" flag in v3 network
diff --git a/doc/TODO b/doc/TODO
index 042b8d1390..7c82600dad 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -107,7 +107,7 @@ Things we'd like to do in 0.2.0.x:
it couldn't fetch any network statuses, and never tried again
even when the network came back and arma clicked on things.
also 0.2.0.
- - phobos says relaybandwidth* sometimes don't do what we expect.
+ o phobos says relaybandwidth* sometimes don't do what we expect.
http://interloper.org/tmp/2007-06-bw-usage.png
I believe this is the result of confusion about whether to use
relaybandwidth or bandwidthrate to control bandwidth usage for
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index a83d43e8f8..1f1018a51a 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -506,8 +506,10 @@ circuit_deliver_create_cell(circuit_t *circ, uint8_t cell_type,
memcpy(cell.payload, payload, ONIONSKIN_CHALLENGE_LEN);
append_cell_to_circuit_queue(circ, circ->n_conn, &cell, CELL_DIRECTION_OUT);
- /* mark it so it gets better rate limiting treatment. */
- circ->n_conn->client_used = time(NULL);
+ if (CIRCUIT_IS_ORIGIN(circ)) {
+ /* mark it so it gets better rate limiting treatment. */
+ circ->n_conn->client_used = time(NULL);
+ }
return 0;
}