diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-01-17 11:12:15 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-01-17 11:12:15 -0500 |
| commit | 4e653ac2cab08edf0e811ae38204e61bc13f1871 (patch) | |
| tree | 01a084e5532ae7d6b3616069b638bfee06233d5a /src/or/command.c | |
| parent | f02c6bcad08754e0946c1ae5199cfebc9e30fe7b (diff) | |
| parent | af8cadf3a9febe3dbe22899b828f9f7946a82cef (diff) | |
| download | tor-4e653ac2cab08edf0e811ae38204e61bc13f1871.tar.gz tor-4e653ac2cab08edf0e811ae38204e61bc13f1871.zip | |
Merge branch 'maint-0.3.1' into maint-0.3.2
Diffstat (limited to 'src/or/command.c')
| -rw-r--r-- | src/or/command.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/or/command.c b/src/or/command.c index ae419ad068..bd70e37a07 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -328,12 +328,6 @@ command_process_create_cell(cell_t *cell, channel_t *chan) if (connection_or_digest_is_known_relay(chan->identity_digest)) { rep_hist_note_circuit_handshake_requested(create_cell->handshake_type); - // Needed for chutney: Sometimes relays aren't in the consensus yet, and - // get marked as clients. This resets their channels once they appear. - // Probably useful for normal operation wrt relay flapping, too. - channel_clear_client(chan); - } else { - channel_mark_client(chan); } if (create_cell->handshake_type != ONION_HANDSHAKE_TYPE_FAST) { |