summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-10-21 13:09:48 +1000
committerteor <teor@torproject.org>2019-10-21 13:09:48 +1000
commit3539fdfd7a0ad965f3e247116a6012d1b5d2a167 (patch)
tree37f6d2d8db1fabc5fa0ea15596adff26f1b96271 /src
parenta1f73cb93da40185f8c8ed055de47e7525e77a3f (diff)
parentc2521873a61ed91e09b48b97713f11ae9c4b4bb5 (diff)
downloadtor-3539fdfd7a0ad965f3e247116a6012d1b5d2a167.tar.gz
tor-3539fdfd7a0ad965f3e247116a6012d1b5d2a167.zip
Merge remote-tracking branch 'tor-github/pr/1168'
Diffstat (limited to 'src')
-rw-r--r--src/core/or/circuitpadding.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c
index 99c68d5f6b..178f066baf 100644
--- a/src/core/or/circuitpadding.c
+++ b/src/core/or/circuitpadding.c
@@ -2179,8 +2179,8 @@ circpad_add_matching_machines(origin_circuit_t *on_circ,
circ->padding_machine[i] = NULL;
on_circ->padding_negotiation_failed = 1;
} else {
- /* Success. Don't try any more machines */
- return;
+ /* Success. Don't try any more machines on this index */
+ break;
}
}
} SMARTLIST_FOREACH_END(machine);