origin_circuit_t.client_proto_type is not useful
The client_proto_type field of origin_circuit_t is set to TO_CONN(conn)->type when an edge_connection_t conn is attached to it. But TO_CONN(conn)->type will always be CONN_TYPE_AP, so this is useless.
Perhaps you want to use the type field of the listener here?