tor

commit b733f9d6ace63c710bc4b567627500cfbeb1592d
parent 36c714687ba99b3b9a5737979df4e9c49de03db3
Author: David Goulet <dgoulet@torproject.org>
Date:   Thu,  2 Jun 2022 16:11:04 -0400

Merge branch 'maint-0.4.7'

Diffstat:
A
changes/bug40620
 | 
3
+++
M
src/core/mainloop/mainloop.c
 | 
4
++--

2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/changes/bug40620 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
@@ -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))