From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 4 Jun 2014 16:27:10 +0000 (-0400)
Subject: Bulletproof our 11246 fix a little, based on recommendation from andrea.
X-Git-Tag: tor-0.2.5.5-alpha~18^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b16321425f477bed0a3220378ff80ac22b805cb1;p=thirdparty%2Ftor.git

Bulletproof our 11246 fix a little, based on recommendation from andrea.
---

diff --git a/src/or/relay.c b/src/or/relay.c
index f565f9274a..6289374049 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -1074,6 +1074,9 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ,
        * EXIT_CONN_STATE_CONNECTING or EXIT_CONN_STATE_RESOLVING.
        * This speeds up HTTP, for example. */
       optimistic_data = 1;
+    } else if (rh.stream_id == 0 && rh.command == RELAY_COMMAND_DATA) {
+      log_warn(LD_BUG, "Somehow I had a connection that matched a "
+               "data cell with stream ID 0.");
     } else {
       return connection_edge_process_relay_cell_not_open(
                &rh, cell, circ, conn, layer_hint);