diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-06-08 09:21:15 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-06-08 09:21:15 -0400 |
| commit | 83135d75a3d87e4fd5f163aecb742180c01d9d0e (patch) | |
| tree | 486864df83ad112b20690ab8fe14861fc67f9c83 /src | |
| parent | 9acca040257caf5894126e8da3df7226f6dcd480 (diff) | |
| parent | 53011e3e54c3d8374c7044b657f90eb723ac39d1 (diff) | |
| download | tor-83135d75a3d87e4fd5f163aecb742180c01d9d0e.tar.gz tor-83135d75a3d87e4fd5f163aecb742180c01d9d0e.zip | |
Merge branch 'maint-0.3.0'
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/relay.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index c119c3df14..0ff53ed5e9 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1636,7 +1636,8 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, "Begin cell for known stream. Dropping."); return 0; } - if (rh.command == RELAY_COMMAND_BEGIN_DIR) { + if (rh.command == RELAY_COMMAND_BEGIN_DIR && + circ->purpose != CIRCUIT_PURPOSE_S_REND_JOINED) { /* Assign this circuit and its app-ward OR connection a unique ID, * so that we can measure download times. The local edge and dir * connection will be assigned the same ID when they are created |