tor

commit 5a2f46a7bafe855870864db258544bf157d300a7
parent 91900d1dae0f24c39613741a898903e74a935010
Author: David Goulet <dgoulet@torproject.org>
Date:   Mon, 18 Sep 2023 09:08:17 -0400

Merge branch 'maint-0.4.7' into maint-0.4.8

Diffstat:
A
changes/ticket40815
 | 
4
++++
M
src/lib/compress/compress_zstd.c
 | 
5
+++--

2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/changes/ticket40815 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
@@ -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) */