diff options
| author | David Goulet <dgoulet@torproject.org> | 2022-06-02 16:11:04 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2022-06-02 16:11:04 -0400 |
| commit | b733f9d6ace63c710bc4b567627500cfbeb1592d (patch) | |
| tree | 223e2afe65855d624110a893386fe0aaa9f93299 | |
| parent | 36c714687ba99b3b9a5737979df4e9c49de03db3 (diff) | |
| parent | dc7902ed55cb6c955590c976e6aef82ecce98170 (diff) | |
| download | tor-b733f9d6ace63c710bc4b567627500cfbeb1592d.tar.gz tor-b733f9d6ace63c710bc4b567627500cfbeb1592d.zip | |
Merge branch 'maint-0.4.7'
| -rw-r--r-- | changes/bug40620 | 3 | ||||
| -rw-r--r-- | src/core/mainloop/mainloop.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/changes/bug40620 b/changes/bug40620 new file mode 100644 index 0000000000..086a71d3f6 --- /dev/null +++ b/changes/bug40620 @@ -0,0 +1,3 @@ + o Minor bugfixes (relay, logging): + - Demote a harmless XOFF log message to from notice level to info level. + Fixes bug 40620; bugfix on 0.4.7.5-alpha. diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c index fe763f7d0f..8e1b33e56e 100644 --- a/src/core/mainloop/mainloop.c +++ b/src/core/mainloop/mainloop.c @@ -636,8 +636,8 @@ connection_start_reading,(connection_t *conn)) if (CONN_IS_EDGE(conn) && TO_EDGE_CONN(conn)->xoff_received) { /* We should not get called here if we're waiting for an XON, but * belt-and-suspenders */ - log_notice(LD_NET, - "Request to start reading on an edgeconn blocked with XOFF"); + log_info(LD_NET, + "Request to start reading on an edgeconn blocked with XOFF"); return; } if (event_add(conn->read_event, NULL)) |