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 | dec7998f5c42dde955760efc72f57025a32da238 (patch) | |
| tree | fa358c6797ea7120da62c656d4b894cb8372c95e /src | |
| parent | 2e5220cb8b34b614fa10102899841247e906fb7b (diff) | |
| parent | 56a7c5bc15e0447203a491c1ee37de9939ad1dcd (diff) | |
| download | tor-dec7998f5c42dde955760efc72f57025a32da238.tar.gz tor-dec7998f5c42dde955760efc72f57025a32da238.zip | |
Merge branch 'maint-0.2.4' into maint-0.2.5
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 9407df0559..daf354c34c 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1500,7 +1500,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 |