tor

commit 270398fa313bad3ff8f568f3290045572a9ca64a
parent 3f73ab3f0dbd717c464c8fa899413d6a20df3587
Author: David Goulet <dgoulet@torproject.org>
Date:   Fri, 18 Jun 2021 14:29:15 -0400

Merge branch 'maint-0.4.6'

Diffstat:
A
changes/ticket40410
 | 
4
++++
M
src/feature/dirclient/dirclient.c
 | 
3
+--

2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/changes/ticket40410 b/changes/ticket40410
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+    - Fix a compilation error when trying to build Tor with a compiler that
+      does not support expanding statitically initialized const values in
+      macro's. Fixes bug 40410; bugfix on 0.4.6.5.
diff --git a/src/feature/dirclient/dirclient.c b/src/feature/dirclient/dirclient.c
@@ -1907,8 +1907,7 @@ dir_client_decompress_response_body(char **bodyp, size_t *bodylenp,
   /* If we're pretty sure that we have a compressed directory, and
    * we didn't manage to uncompress it, then warn and bail. */
   if (!plausible && !new_body) {
-    const int LOG_INTERVAL = 3600;
-    static ratelim_t warning_limit = RATELIM_INIT(LOG_INTERVAL);
+    static ratelim_t warning_limit = RATELIM_INIT(60 * 60);
     log_fn_ratelim(&warning_limit, LOG_WARN, LD_HTTP,
            "Unable to decompress HTTP body (tried %s%s%s, on %s).",
            description1,