diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index b81baeedb9..0fab50c255 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -256,8 +256,10 @@ circuit_dump_by_conn(connection_t *conn, int severity)
         circ->n_addr == conn->addr &&
         circ->n_port == conn->port &&
         !memcmp(conn->identity_digest, circ->n_conn_id_digest, DIGEST_LEN)) {
-      circuit_dump_details(severity, circ, conn->poll_index, "Pending",
-// XXX actually, this could be a circuit that's open and ends here too
+      circuit_dump_details(severity, circ, conn->poll_index,
+                           (circ->state == CIRCUIT_STATE_OPEN &&
+                            !CIRCUIT_IS_ORIGIN(circ)) ?
+                             "Endpoint" : "Pending",
                            circ->n_circ_id, circ->p_circ_id);
     }
   }