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 | 987c7cae7073ba2c579cc81f973446831246858d (patch) | |
| tree | fb8a9bf5d2884caf5b03bafed5f5469531ef3804 /src/or/relay.c | |
| parent | d561da10ddb429e1d3f4f74723e94e39f7257a9e (diff) | |
| parent | d15d09a96839e0c13a9b9845a51a402d7a931949 (diff) | |
| download | tor-987c7cae7073ba2c579cc81f973446831246858d.tar.gz tor-987c7cae7073ba2c579cc81f973446831246858d.zip | |
Merge branch 'maint-0.2.8' into maint-0.2.9
Diffstat (limited to 'src/or/relay.c')
| -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 1794215378..4e9dadba16 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1499,7 +1499,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 |