nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 15:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug21007'

Browse Source
This commit is contained in:
Nick Mathewson 2016-12-19 12:31:29 -05:00
commit b6a5376b9c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/or/circuitbuild.c
View File

@ -971,7 +971,9 @@ circuit_send_next_onion_skin(origin_circuit_t *circ)
// The circuit is usable; we already marked the guard as okay. // The circuit is usable; we already marked the guard as okay.
r = GUARD_USABLE_NOW; r = GUARD_USABLE_NOW;
} else if (! circ->guard_state) { } else if (! circ->guard_state) {
if (circuit_get_cpath_len(circ) != 1) { if (circuit_get_cpath_len(circ) != 1 &&
circ->base_.purpose != CIRCUIT_PURPOSE_TESTING &&
get_options()->UseEntryGuards) {
log_warn(LD_BUG, "%d-hop circuit %p with purpose %d has no " log_warn(LD_BUG, "%d-hop circuit %p with purpose %d has no "
"guard state", "guard state",
circuit_get_cpath_len(circ), circ, circ->base_.purpose); circuit_get_cpath_len(circ), circ, circ->base_.purpose);