tor

commit 8425e1e575bfd57670b65a9b944da9dcbe2365a0
parent fada3c0d0237678266b395d3a4ab30b373bb8888
Author: David Goulet <dgoulet@torproject.org>
Date:   Mon, 18 Sep 2023 09:11:06 -0400

Merge branch 'maint-0.4.8'

Diffstat:
A
changes/ticket40848
 | 
4
++++
M
src/feature/relay/routerkeys.h
 | 
1
-

2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/changes/ticket40848 b/changes/ticket40848
@@ -0,0 +1,4 @@
+  o Minor bugfix (defensive programming):
+    - Disable multiple BUG warnings of a missing relay identity key when
+      starting an instance of Tor compiled without relay support.
+      Fixes bug 40848; bugfix on 0.4.3.1-alpha.
diff --git a/src/feature/relay/routerkeys.h b/src/feature/relay/routerkeys.h
@@ -53,7 +53,6 @@ void routerkeys_free_all(void);
 static inline void *
 relay_key_is_unavailable_(void)
 {
-  tor_assert_nonfatal_unreached();
   return NULL;
 }
 #define relay_key_is_unavailable(type) \