tor

commit 36cd4a50fc9d861c6c35a0f6dcb22f29cb39a53e
parent e12a26e4d0beb6407d8bd4ded06cf48862ebeff0
Author: David Goulet <dgoulet@torproject.org>
Date:   Mon, 29 Apr 2024 16:02:12 -0400

Merge branch 'maint-0.4.8'

Diffstat:
A
changes/ticket40932
 | 
3
+++
M
src/core/or/relay.c
 | 
1
-
M
src/feature/hs/hs_intropoint.c
 | 
1
-

3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/changes/ticket40932 b/changes/ticket40932
@@ -0,0 +1,3 @@
+  o Minor bugfix (circuit):
+    - Remove a log_warn being triggered by a protocol violation that already
+      emits a protocol warning log. Fixes bug 40932; bugfix on 0.4.8.1-alpha.
diff --git a/src/core/or/relay.c b/src/core/or/relay.c
@@ -751,7 +751,6 @@ relay_send_command_from_edge_,(streamid_t stream_id, circuit_t *orig_circ,
                                        cpath_layer, stream_id, filename,
                                        lineno);
   if (ret < 0) {
-    log_warn(LD_BUG,"circuit_package_relay_cell failed. Closing.");
     circuit_mark_for_close(circ, END_CIRC_REASON_INTERNAL);
     return -1;
   } else if (ret == 0) {
diff --git a/src/feature/hs/hs_intropoint.c b/src/feature/hs/hs_intropoint.c
@@ -710,7 +710,6 @@ handle_introduce1(or_circuit_t *client_circ, const uint8_t *request,
                                    RELAY_COMMAND_INTRODUCE2,
                                    (char *) request, request_len, NULL)) {
     relay_increment_intro1_action(INTRO1_CIRCUIT_DEAD);
-    log_warn(LD_PROTOCOL, "Unable to send INTRODUCE2 cell to the service.");
     /* Inform the client that we can't relay the cell. Use the unknown ID
      * status code since it means that we do not know the service. */
     status = TRUNNEL_HS_INTRO_ACK_STATUS_UNKNOWN_ID;