Add a pointer from edge connections to their corresponding circuit (ulp!); add some debugging sanity-checking for cirid_orconn_map stuff

svn:r4024

1 files changed, 1 insertions, 0 deletions

diff --git a/src/or/dns.c b/src/or/dns.c
index 02f44697e5..1a488920e2 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -571,6 +571,7 @@ static void dns_found_answer(char *address, uint32_t addr, char outcome) {
         circuit_detach_stream(circ, pend->conn);
         /* and link it to n_streams */
         pend->conn->next_stream = circ->n_streams;
+        pend->conn->on_circuit = circ;
         circ->n_streams = pend->conn;
 
         connection_exit_connect(pend->conn);