diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-02-07 10:38:24 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-02-07 10:38:24 -0500 |
| commit | 372adfa09a143490dfc058a6e2db78ca27ef9399 (patch) | |
| tree | a01dd55e84961d85b1067a6d1c22cd1764ccb0b6 /src/or/connection_or.c | |
| parent | 5990edd1952361faca4619728b50587061d81be7 (diff) | |
| parent | a7e946596d6da9aca80456141b7fddbc198c217c (diff) | |
| download | tor-372adfa09a143490dfc058a6e2db78ca27ef9399.tar.gz tor-372adfa09a143490dfc058a6e2db78ca27ef9399.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Diffstat (limited to 'src/or/connection_or.c')
| -rw-r--r-- | src/or/connection_or.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 089de93f78..dbf05a6fc8 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -691,6 +691,11 @@ connection_or_about_to_close(or_connection_t *or_conn) /* Tell the controlling channel we're closed */ if (or_conn->chan) { channel_closed(TLS_CHAN_TO_BASE(or_conn->chan)); + /* + * NULL this out because the channel might hang around a little + * longer before channel_run_cleanup() gets it. + */ + or_conn->chan->conn = NULL; or_conn->chan = NULL; } |