aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2006-10-31 23:33:29 +0000
committerNick Mathewson <nickm@torproject.org>2006-10-31 23:33:29 +0000
commitd20ad9e46db844c90bcd9a0161706361601a54cf (patch)
tree6c70162e4c785bdef87c699e6e133acb97880371
parent0bcc5d80815d5e66f3c30441090fe68a022434b9 (diff)
downloadtor-d20ad9e46db844c90bcd9a0161706361601a54cf.tar.gz
tor-d20ad9e46db844c90bcd9a0161706361601a54cf.zip
Fix 0.1.1.x branch to not warn when an OR gives it a new circuit end reason. (Bug 351)
svn:r8884
-rw-r--r--ChangeLog2
-rw-r--r--src/or/circuitlist.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 54d47f4c6b..73d522ac28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,8 @@ Changes in version 0.1.1.25 - 2006-11-?? [ongoing]
certain commands from a v0 controller on platforms that do not
handle printf("%s",NULL) gracefully.
- Avoid infinite loop on unexpected controller input.
+ - Don't log spurious warnings when we see a circuit close reason we
+ don't recognize; it's probably just from a newer version of Tor.
Changes in version 0.1.1.24 - 2006-09-29
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 73513c4030..fc81313f03 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -680,7 +680,7 @@ _circuit_mark_for_close(circuit_t *circ, int reason, int line,
reason = END_CIRC_REASON_NONE;
}
if (reason < _END_CIRC_REASON_MIN || reason > _END_CIRC_REASON_MAX) {
- log_warn(LD_BUG, "Reason %d out of range at %s:%d", reason, file, line);
+ log_info(LD_BUG, "Reason %d out of range at %s:%d", reason, file, line);
reason = END_CIRC_REASON_NONE;
}