diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-01-18 10:44:35 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-01-18 10:44:35 -0500 |
| commit | b6dce6cfec20f2e23bf60533aa0e2f23fc1daac5 (patch) | |
| tree | 465c2b82ba18048b6a3770444be0861ca91849a0 /src/or | |
| parent | d31209ad6f65c8a4725bbed3e614b9ccff24eb3f (diff) | |
| parent | 1bc440eda476e3d270aa5fe1810a3d1d4778d725 (diff) | |
| download | tor-b6dce6cfec20f2e23bf60533aa0e2f23fc1daac5.tar.gz tor-b6dce6cfec20f2e23bf60533aa0e2f23fc1daac5.zip | |
Merge remote-tracking branch 'asn/bug21142'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/circuitlist.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 2d2dbccc5d..54a7db9dbf 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1858,6 +1858,9 @@ circuit_about_to_free(circuit_t *circ) if (circuits_pending_chans) smartlist_remove(circuits_pending_chans, circ); } + if (circuits_pending_other_guards) { + smartlist_remove(circuits_pending_other_guards, circ); + } if (CIRCUIT_IS_ORIGIN(circ)) { control_event_circuit_status(TO_ORIGIN_CIRCUIT(circ), (circ->state == CIRCUIT_STATE_OPEN || |