diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-10-04 23:33:50 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-10-04 23:33:50 -0400 |
| commit | 9edd85aa4cb019499294b4c378961be8e42bcefe (patch) | |
| tree | 357242177e773ccc235782bc640c6771ef06598a /src | |
| parent | b9f2ccbdcc222869b7561714c285db8b47e52e77 (diff) | |
| download | tor-9edd85aa4cb019499294b4c378961be8e42bcefe.tar.gz tor-9edd85aa4cb019499294b4c378961be8e42bcefe.zip | |
Switch an && to an ||, stop a *NULL.
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/circuitbuild.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index f485574408..6e9e0e192a 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -3358,7 +3358,7 @@ entry_is_live(entry_guard_t *e, int need_uptime, int need_capacity, return NULL; } node = node_get_by_id(e->identity); - if (!node && !node_has_descriptor(node)) { + if (!node || !node_has_descriptor(node)) { *msg = "no descriptor"; return NULL; } |