Merge branch 'tor-gitlab/mr/764' into maint-0.4.7

This commit is contained in:
David Goulet 2023-09-18 09:08:13 -04:00
commit c0a10b259c
2 changed files with 7 additions and 2 deletions

4
changes/ticket40815 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (compression, zstd):
- Use less frightening language and lower the log-level of our run-time ABI
compatibility check message in our Zstd compression subsystem. Fixes bug
40815; bugfix on 0.4.3.1-alpha.

View File

@ -522,9 +522,10 @@ tor_zstd_warn_if_version_mismatched(void)
tor_zstd_format_version(runtime_version, sizeof(runtime_version),
ZSTD_versionNumber());
log_warn(LD_GENERAL,
log_info(LD_GENERAL,
"Tor was compiled with zstd %s, but is running with zstd %s. "
"For safety, we'll avoid using advanced zstd functionality.",
"For ABI compatibility reasons, we'll avoid using advanced zstd "
"functionality.",
header_version, runtime_version);
}
#endif /* defined(HAVE_ZSTD) && defined(ENABLE_ZSTD_ADVANCED_APIS) */