nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'sebastian/bug1921'

Browse Source
This commit is contained in:
Nick Mathewson 2010-09-16 10:52:43 -04:00
commit c009c9da01
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug1921 Normal file
View File

@ -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.

4
src/or/relay.c
View File

@ -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 + flushed = (uint32_t)((now.tv_sec % SECONDS_IN_A_DAY) * 100L +
(uint32_t)now.tv_usec / (uint32_t)10000L); (uint32_t)now.tv_usec / (uint32_t)10000L);
if (!it_queue || !it_queue->first) { 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 { } else {
or_circuit_t *orcirc = TO_OR_CIRCUIT(circ); or_circuit_t *orcirc = TO_OR_CIRCUIT(circ);
insertion_time_elem_t *elem = it_queue->first; insertion_time_elem_t *elem = it_queue->first;