diff options
| author | teor <teor@torproject.org> | 2019-08-30 23:33:01 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-08-30 23:33:01 +1000 |
| commit | a52a5e0099f9201e0dc1a358b1ac7721070caf56 (patch) | |
| tree | 1d59f468697d72e6d2476d43127282d204284223 /src/feature/client | |
| parent | 357e9a6f2c88b99e85e65c0401c524adbe921665 (diff) | |
| parent | 1132dc9f75d7e5cbda1c5a6ac91d82c420967c0e (diff) | |
| download | tor-a52a5e0099f9201e0dc1a358b1ac7721070caf56.tar.gz tor-a52a5e0099f9201e0dc1a358b1ac7721070caf56.zip | |
Merge branch 'maint-0.3.5' into maint-0.4.0
Diffstat (limited to 'src/feature/client')
| -rw-r--r-- | src/feature/client/entrynodes.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c index 15ec830594..819f90a6d9 100644 --- a/src/feature/client/entrynodes.c +++ b/src/feature/client/entrynodes.c @@ -2611,6 +2611,10 @@ entry_guards_upgrade_waiting_circuits(guard_selection_t *gs, entry_guard_t *guard = entry_guard_handle_get(state->guard); if (!guard || guard->in_selection != gs) continue; + if (TO_CIRCUIT(circ)->marked_for_close) { + /* Don't consider any marked for close circuits. */ + continue; + } smartlist_add(all_circuits, circ); } SMARTLIST_FOREACH_END(circ); |