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 | 40bccc20042fcc4f43964b358257470830169e73 (patch) | |
| tree | 59a3a63518f1c8aae96cd26de2657084a4b26975 /src | |
| parent | a56cfdaba20683562e5793d6bded58a591afb04c (diff) | |
| parent | dec7998f5c42dde955760efc72f57025a32da238 (diff) | |
| download | tor-40bccc20042fcc4f43964b358257470830169e73.tar.gz tor-40bccc20042fcc4f43964b358257470830169e73.zip | |
Merge branch 'maint-0.2.5' into maint-0.2.6
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 50eaab83c8..bbb5f27c93 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 |