diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-07-23 12:32:14 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-07-23 12:32:14 -0400 |
| commit | ab1f39322c22c3801ffd3a7e6842352230fff113 (patch) | |
| tree | 5bfdc1f2c3c1d6f6f8cd7dc980d457ded40e15ee /src | |
| parent | f6db290e5a7268ebe9dc504af53d50294766ac22 (diff) | |
| parent | aed82bf4109126a3088752d7bec45bab4f5e1537 (diff) | |
| download | tor-ab1f39322c22c3801ffd3a7e6842352230fff113.tar.gz tor-ab1f39322c22c3801ffd3a7e6842352230fff113.zip | |
Merge remote-tracking branch 'tor-github/pr/1185'
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/or/circuitpadding_machines.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/core/or/circuitpadding_machines.c b/src/core/or/circuitpadding_machines.c index 75d2614aca..7220d657fc 100644 --- a/src/core/or/circuitpadding_machines.c +++ b/src/core/or/circuitpadding_machines.c @@ -155,7 +155,6 @@ circpad_machine_relay_hide_intro_circuits(smartlist_t *machines_sl) relay_machine->name = "relay_ip_circ"; relay_machine->conditions.state_mask = CIRCPAD_CIRC_OPENED; - relay_machine->target_hopnum = 2; /* This is a relay-side machine */ relay_machine->is_origin_side = 0; @@ -387,7 +386,6 @@ circpad_machine_relay_hide_rend_circuits(smartlist_t *machines_sl) /* Only pad after the circuit has been built and pad to the middle */ relay_machine->conditions.min_hops = 2; relay_machine->conditions.state_mask = CIRCPAD_CIRC_OPENED; - relay_machine->target_hopnum = 2; /* This is a relay-side machine */ relay_machine->is_origin_side = 0; @@ -408,7 +406,7 @@ circpad_machine_relay_hide_rend_circuits(smartlist_t *machines_sl) /* OBFUSCATE_CIRC_SETUP -> END transition when we send our first * padding packet and/or hit the state length (the state length is 1). */ relay_machine->states[CIRCPAD_STATE_OBFUSCATE_CIRC_SETUP]. - next_state[CIRCPAD_EVENT_PADDING_RECV] = CIRCPAD_STATE_END; + next_state[CIRCPAD_EVENT_PADDING_SENT] = CIRCPAD_STATE_END; relay_machine->states[CIRCPAD_STATE_OBFUSCATE_CIRC_SETUP]. next_state[CIRCPAD_EVENT_LENGTH_COUNT] = CIRCPAD_STATE_END; |