diff options
| author | David Goulet <dgoulet@torproject.org> | 2023-09-18 09:11:06 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2023-09-18 09:11:06 -0400 |
| commit | 2adbd06a7f129f0d319768f34814b782f89498f8 (patch) | |
| tree | e36a347e503bf54fc762320d76e44ddf44871a08 | |
| parent | cb036351c02f398e04472edb9932312c312962b0 (diff) | |
| parent | 2c8430cb2f025f221ddd7b26056e91bed01a56b7 (diff) | |
| download | tor-2adbd06a7f129f0d319768f34814b782f89498f8.tar.gz tor-2adbd06a7f129f0d319768f34814b782f89498f8.zip | |
Merge branch 'maint-0.4.8' into release-0.4.8
| -rw-r--r-- | changes/ticket40848 | 4 | ||||
| -rw-r--r-- | src/feature/relay/routerkeys.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/ticket40848 b/changes/ticket40848 new file mode 100644 index 0000000000..a50a9a028f --- /dev/null +++ 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 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) \ |