From c097fb33fc081165a55f0b9417d7c8bf5dc91cd6 Mon Sep 17 00:00:00 2001
From: Andrea Shepard <andrea@torproject.org>
Date: Mon, 1 Oct 2012 14:22:04 -0700
Subject: [PATCH] Detach circuits from circuitmux early when freeing channel so
 they can find the channel by ID

---
 src/or/channel.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/or/channel.c b/src/or/channel.c
index 8241556b57..4ad5bf15f3 100644
--- a/src/or/channel.c
+++ b/src/or/channel.c
@@ -2766,6 +2766,10 @@ channel_free_list(smartlist_t *channels, int mark_for_close)
               "in state %s (%d)",
               curr, U64_PRINTF_ARG(curr->global_identifier),
               channel_state_to_string(curr->state), curr->state);
+    /* Detach circuits early so they can find the channel */
+    if (curr->cmux) {
+      circuitmux_detach_all_circuits(curr->cmux);
+    }
     channel_unregister(curr);
     if (mark_for_close) {
       if (!(curr->state == CHANNEL_STATE_CLOSING ||