diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-12-19 12:31:29 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-19 12:31:29 -0500 |
| commit | b6a5376b9ce8dcbed626a38809990b9f968f1cb9 (patch) | |
| tree | bf07b34acc2ba2add9853d06e1729d440c1310ed | |
| parent | 271bfc92b8d1f91d9b9a58e85f5e0c4746944632 (diff) | |
| parent | c468df3961739720337baa6cc01da23aa8520712 (diff) | |
| download | tor-b6a5376b9ce8dcbed626a38809990b9f968f1cb9.tar.gz tor-b6a5376b9ce8dcbed626a38809990b9f968f1cb9.zip | |
Merge branch 'bug21007'
| -rw-r--r-- | src/or/circuitbuild.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index a14a2b1482..55929c1666 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -971,7 +971,9 @@ circuit_send_next_onion_skin(origin_circuit_t *circ) // The circuit is usable; we already marked the guard as okay. r = GUARD_USABLE_NOW; } 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 " "guard state", circuit_get_cpath_len(circ), circ, circ->base_.purpose); |