From 9edd85aa4cb019499294b4c378961be8e42bcefe Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 4 Oct 2010 23:33:50 -0400
Subject: [PATCH] Switch an && to an ||, stop a *NULL.

---
 src/or/circuitbuild.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
   }