diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-10-04 12:46:33 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-10-04 12:46:33 -0400 |
| commit | 0a3dfd0423e230bf5b29c21623480af777bb22c1 (patch) | |
| tree | 6daa188e7f976202f02f951f66fb6f3ac58dae51 | |
| parent | b1971d89c8776f06ddce7f44d98dde79c3dfc223 (diff) | |
| parent | e50fa0d6cb467e8f6d41995eb6d03d74e9f64e04 (diff) | |
| download | tor-0a3dfd0423e230bf5b29c21623480af777bb22c1.tar.gz tor-0a3dfd0423e230bf5b29c21623480af777bb22c1.zip | |
Merge remote-tracking branch 'arma/bug7037' into maint-0.2.3
| -rw-r--r-- | changes/bug7037 | 6 | ||||
| -rw-r--r-- | src/or/command.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/changes/bug7037 b/changes/bug7037 new file mode 100644 index 0000000000..fc3a1ad1c5 --- /dev/null +++ b/changes/bug7037 @@ -0,0 +1,6 @@ + o Minor bugfixes: + - When relays refuse a "create" cell because their queue of pending + create cells is too big (typically because their cpu can't keep up + with the arrival rate), send back reason "resource limit" rather + than reason "internal", so network measurement scripts can get a + more accurate picture. Bugfix on 0.1.1.11-alpha; fixes bug 7037. diff --git a/src/or/command.c b/src/or/command.c index abf664c1e2..d8a409bc27 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -428,7 +428,7 @@ command_process_create_cell(cell_t *cell, or_connection_t *conn) log_warn(LD_GENERAL,"Failed to hand off onionskin. Closing.%s",m); tor_free(m); } - circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_INTERNAL); + circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_RESOURCELIMIT); return; } log_debug(LD_OR,"success: handed off onionskin."); |