From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 31 Jan 2017 16:35:57 +0000 (-0500)
Subject: Downgrade assertion to nonfatal for #21242
X-Git-Tag: tor-0.3.0.3-alpha~24^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93b39c51629ed0ded2bf807cb6a06d59f3a55347;p=thirdparty%2Ftor.git

Downgrade assertion to nonfatal for #21242

This assertion triggered in the (error) case where we got a result
from guards_choose_guard() without a descriptor.  That's not
supposed to be possible, but it's not worth crashing over.
---

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index f11c865ad0..88445f9248 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -2369,7 +2369,7 @@ onion_extend_cpath(origin_circuit_t *circ)
       int client = (server_mode(get_options()) == 0);
       info = extend_info_from_node(r, client);
       /* Clients can fail to find an allowed address */
-      tor_assert(info || client);
+      tor_assert_nonfatal(info || client);
     }
   } else {
     const node_t *r =