From: David Goulet <dgoulet@torproject.org>
Date: Mon, 9 Jun 2025 13:50:24 +0000 (-0400)
Subject: Merge branch 'maint-0.4.8'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd8b1b2185b6311517d9d8c379483fd80442cba5;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.8'
---

bd8b1b2185b6311517d9d8c379483fd80442cba5
diff --cc src/core/or/relay.c
index f116cb5972,a6321f180f..84dfe00157
--- a/src/core/or/relay.c
+++ b/src/core/or/relay.c
@@@ -292,13 -284,12 +296,12 @@@ circuit_receive_relay_cell(cell_t *cell
          log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
                 "connection_edge_process_relay_cell (away from origin) "
                 "failed.");
-         return reason;
+         goto error;
        }
-     }
-     if (cell_direction == CELL_DIRECTION_IN) {
+     } else if (cell_direction == CELL_DIRECTION_IN) {
        ++stats_n_relay_cells_delivered;
        log_debug(LD_OR,"Sending to origin.");
 -      reason = connection_edge_process_relay_cell(cell, circ, conn,
 +      reason = connection_edge_process_relay_cell(msg, circ, conn,
                                                    layer_hint);
        if (reason < 0) {
          /* If a client is trying to connect to unknown hidden service port,