aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/ticket340835
-rw-r--r--src/core/or/connection_edge.c9
2 files changed, 9 insertions, 5 deletions
diff --git a/changes/ticket34083 b/changes/ticket34083
new file mode 100644
index 0000000000..417d01c5a5
--- /dev/null
+++ b/changes/ticket34083
@@ -0,0 +1,5 @@
+ o Minor bugfixes (onion service):
+ - Fix a warning BUG that would occur often on heavily loaded onion service
+ leading to filling the logs with useless warnings. Fixes bug 34083; bugfix
+ on 0.3.2.1-alpha.
+
diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c
index d4d9d2f759..4228cd6aba 100644
--- a/src/core/or/connection_edge.c
+++ b/src/core/or/connection_edge.c
@@ -1347,11 +1347,10 @@ connection_ap_attach_pending(int retry)
continue;
}
if (conn->state != AP_CONN_STATE_CIRCUIT_WAIT) {
- log_warn(LD_BUG, "%p is no longer in circuit_wait. Its current state "
- "is %s. Why is it on pending_entry_connections?",
- entry_conn,
- conn_state_to_string(conn->type, conn->state));
- UNMARK();
+ /* The connection_ap_handshake_attach_circuit() call, for onion service,
+ * can lead to more than one connections in the "pending" list to change
+ * state and so it is OK to get here. Ignore it because this connection
+ * won't be in pending_entry_connections list after this point. */
continue;
}