diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-09-16 10:52:43 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-09-16 10:52:43 -0400 |
| commit | c009c9da016a1285262482655fc72f38cf03c2d7 (patch) | |
| tree | 72a94c293038d6871dbbc5423cac1acda18ff213 | |
| parent | 0ac67bf3c3aff13adccafb6ded303cb9f186d188 (diff) | |
| parent | 4f1e36ca1d2c8051f6d282fadef3834b4b76462f (diff) | |
| download | tor-c009c9da016a1285262482655fc72f38cf03c2d7.tar.gz tor-c009c9da016a1285262482655fc72f38cf03c2d7.zip | |
Merge remote branch 'sebastian/bug1921'
| -rw-r--r-- | changes/bug1921 | 4 | ||||
| -rw-r--r-- | src/or/relay.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/changes/bug1921 b/changes/bug1921 new file mode 100644 index 0000000000..748d50b13d --- /dev/null +++ b/changes/bug1921 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Demote a warn to info that happens when the CellStatistics option + was just enabled. Fixes bug 1921; bugfix on 0.2.2.1-alpha. Reported + by Moritz Bartl. diff --git a/src/or/relay.c b/src/or/relay.c index a4f7718d90..f6f5d92fcb 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -2297,7 +2297,9 @@ connection_or_flush_from_first_active_circuit(or_connection_t *conn, int max, flushed = (uint32_t)((now.tv_sec % SECONDS_IN_A_DAY) * 100L + (uint32_t)now.tv_usec / (uint32_t)10000L); if (!it_queue || !it_queue->first) { - log_warn(LD_BUG, "Cannot determine insertion time of cell."); + log_info(LD_GENERAL, "Cannot determine insertion time of cell. " + "Looks like the CellStatistics option was " + "recently enabled."); } else { or_circuit_t *orcirc = TO_OR_CIRCUIT(circ); insertion_time_elem_t *elem = it_queue->first; |