Merge branch 'maint-0.4.8'

This commit is contained in:
David Goulet 2023-09-18 09:11:06 -04:00
commit 8425e1e575
2 changed files with 4 additions and 1 deletions

4
changes/ticket40848 Normal file
View File

@ -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.

View File

@ -53,7 +53,6 @@ void routerkeys_free_all(void);
static inline void * static inline void *
relay_key_is_unavailable_(void) relay_key_is_unavailable_(void)
{ {
tor_assert_nonfatal_unreached();
return NULL; return NULL;
} }
#define relay_key_is_unavailable(type) \ #define relay_key_is_unavailable(type) \