commit 1a5746f8e1a392f0b67e36083019534bf97f1fa6 Merge: 82f109c2b d256d4c0a Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 29 09:37:01 2017 -0400

Merge branch 'bug8185_025' into bug8185_031

changes/bug8185_025 | 6 ++++++ src/or/relay.c | 11 +++++++++++ 2 files changed, 17 insertions(+)

diff --cc src/or/relay.c index cb1a0692b,48c823423..81942af1e --- a/src/or/relay.c +++ b/src/or/relay.c @@@ -824,16 -708,12 +829,22 @@@ connection_edge_send_command(edge_conne return -1; }

+ if (circ->marked_for_close) { + /* The circuit has been marked, but not freed yet. When it's freed, it + * will mark this connection for close. */ + return -1; + } + +#ifdef MEASUREMENTS_21206 + /* Keep track of the number of RELAY_DATA cells sent for directory + * connections. */ + connection_t *linked_conn = TO_CONN(fromconn)->linked_conn; + + if (linked_conn && linked_conn->type == CONN_TYPE_DIR) { + ++(TO_DIR_CONN(linked_conn)->data_cells_sent); + } +#endif + return relay_send_command_from_edge(fromconn->stream_id, circ, relay_command, payload, payload_len, cpath_layer);