tor

commit 7b102d53e3ff3c4b2a8f9fe6d583f7b2273ed001
parent 18654b629f5fdc3f40ca64e41d0e61ea4c7dc6ef
Author: David Goulet <dgoulet@torproject.org>
Date:   Thu, 21 Jan 2021 12:27:27 -0500

Merge branch 'tor-gitlab/mr/265' into maint-0.4.5

Diffstat:
A
changes/bug32666
 | 
3
+++
M
src/core/or/circuitbuild.c
 | 
1
-

2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/changes/bug32666 b/changes/bug32666
@@ -0,0 +1,3 @@
+  o Minor bugfixes (onion services):
+    - Avoid a non-fatal assertion in certain edge-cases when establishing a
+      circuit to onion service. Fixes bug 32666; bugfix on 0.3.0.3-alpha.
diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c
@@ -2456,7 +2456,6 @@ onion_extend_cpath(origin_circuit_t *circ)
       choose_good_middle_server(purpose, state, circ->cpath, cur_len);
     if (r) {
       info = extend_info_from_node(r, 0);
-      tor_assert_nonfatal(info);
     }
   }