mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 14:51:11 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'tor-gitlab/mr/583' into maint-0.4.7

Browse source
This commit is contained in:
David Goulet 2022-06-02 16:09:56 -04:00
commit dc7902ed55
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changes/bug40620 Normal file
View file

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

4
src/core/mainloop/mainloop.c
View file

@ -644,8 +644,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))