diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-09-15 14:20:28 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-09-15 14:20:28 -0400 |
| commit | c18bcc8a55dfaef21637b9f6f38d05610b6ab50c (patch) | |
| tree | ea584ae1eda6d6dd34b7537bbb9f75af15dbc4ba /src/or/connection_or.c | |
| parent | 6d8fc4eb3866122ef42f209cc51a875a3e438607 (diff) | |
| parent | 69508d04a2db530c0bbb4c1cc421e6b258b822be (diff) | |
| download | tor-c18bcc8a55dfaef21637b9f6f38d05610b6ab50c.tar.gz tor-c18bcc8a55dfaef21637b9f6f38d05610b6ab50c.zip | |
Merge branch 'bug1184'
Diffstat (limited to 'src/or/connection_or.c')
| -rw-r--r-- | src/or/connection_or.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 686037f2de..4d82da63e9 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1323,10 +1323,6 @@ connection_or_send_destroy(circid_t circ_id, or_connection_t *conn, int reason) cell.payload[0] = (uint8_t) reason; log_debug(LD_OR,"Sending destroy (circID %d).", circ_id); - /* XXXX It's possible that under some circumstances, we want the destroy - * to take precedence over other data waiting on the circuit's cell queue. - */ - connection_or_write_cell_to_buf(&cell, conn); return 0; } |