aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2024-04-29 16:02:12 -0400
committerDavid Goulet <dgoulet@torproject.org>2024-04-29 16:02:12 -0400
commit36cd4a50fc9d861c6c35a0f6dcb22f29cb39a53e (patch)
treea9bae5a5651b04243950a257d9ef06c84af49770 /src
parente12a26e4d0beb6407d8bd4ded06cf48862ebeff0 (diff)
parentbedc6a90d236f00f91597c67e1fd74a13de01808 (diff)
downloadtor-36cd4a50fc9d861c6c35a0f6dcb22f29cb39a53e.tar.gz
tor-36cd4a50fc9d861c6c35a0f6dcb22f29cb39a53e.zip
Merge branch 'maint-0.4.8'
Diffstat (limited to 'src')
-rw-r--r--src/core/or/relay.c1
-rw-r--r--src/feature/hs/hs_intropoint.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/src/core/or/relay.c b/src/core/or/relay.c
index 5841a56ffa..f7d200c18d 100644
--- 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
index 02b5b4866b..e799a4c7e4 100644
--- 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;