diff options
| author | Liliana Marie Prikler <[email protected]> | 2023-09-24 12:19:01 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <[email protected]> | 2023-09-24 12:19:01 +0200 |
| commit | b18b2d13488f2a92331ccad2dc8cbb54ee15582f (patch) | |
| tree | fe841af2c61142cf065f4bd0f9d5b8668ae90823 /gnu/packages/patches/tor-remove-defensive-assert.patch | |
| parent | afa9da84255d32d9f457be381c12666b69ac3f69 (diff) | |
| parent | 35fd25af9bbcce84908101a9f487ba106a8d6df7 (diff) | |
Merge branch 'master' into gnome-team
Diffstat (limited to 'gnu/packages/patches/tor-remove-defensive-assert.patch')
| -rw-r--r-- | gnu/packages/patches/tor-remove-defensive-assert.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/gnu/packages/patches/tor-remove-defensive-assert.patch b/gnu/packages/patches/tor-remove-defensive-assert.patch deleted file mode 100644 index 7207ec867a..0000000000 --- a/gnu/packages/patches/tor-remove-defensive-assert.patch +++ /dev/null @@ -1,28 +0,0 @@ -This patch removes a call to `tor_assert_nonfatal_unreached()` in -`relay_key_is_unavailable_()` that is only called when Tor is compiled -without relay support. - -Unfortunately, the non-fatal assertion causes a BUG log -message to appear for clients when they start up without relay support -for each CPU worker we spawn. This makes it spotting issues during -bootstrap harder particularly for our iOS developers. - -Since the call sites to `get_master_identity_key()` handles `NULL` -values already, we do not think this will be an issue later on. - -Reported by Benjamin Erhart (@tla) from Guardian Project. - -Fixes tpo/core/tor#40848. - -diff --git a/src/feature/relay/routerkeys.h b/src/feature/relay/routerkeys.h -index 7b6d80773c..b97615a9c9 100644 ---- 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) \ |