diff options
| author | David Goulet <dgoulet@torproject.org> | 2023-09-18 09:08:13 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2023-09-18 09:08:13 -0400 |
| commit | c0a10b259c4f5f58cf8b1a1c94314e49f6cc7eba (patch) | |
| tree | 2479c871a4451eae8bf01670a45ef9ba093e42a3 | |
| parent | bb44a0a54408527050414d21fb7c673be613c41e (diff) | |
| parent | 3d160b37c234e3a26d93c5dad0dbd5137ddfd469 (diff) | |
| download | tor-c0a10b259c4f5f58cf8b1a1c94314e49f6cc7eba.tar.gz tor-c0a10b259c4f5f58cf8b1a1c94314e49f6cc7eba.zip | |
Merge branch 'tor-gitlab/mr/764' into maint-0.4.7
| -rw-r--r-- | changes/ticket40815 | 4 | ||||
| -rw-r--r-- | src/lib/compress/compress_zstd.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/changes/ticket40815 b/changes/ticket40815 new file mode 100644 index 0000000000..88129b7bb1 --- /dev/null +++ b/changes/ticket40815 @@ -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. diff --git a/src/lib/compress/compress_zstd.c b/src/lib/compress/compress_zstd.c index 85c2bb3bfa..9b18930d16 100644 --- a/src/lib/compress/compress_zstd.c +++ b/src/lib/compress/compress_zstd.c @@ -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) */ |