tor

commit e5be039494745a3b0d101e422aa5793aaeac3567
parent f65f4b5c38bc79e2b3f1a10c21cedce9376ad87e
Author: teor <teor@torproject.org>
Date:   Mon, 12 Aug 2019 09:50:42 +1000

Merge remote-tracking branch 'tor-github/pr/1034' into maint-0.3.5

Diffstat:
A
changes/ticket29617
 | 
4
++++
M
src/feature/relay/dns.c
 | 
3
++-

2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/changes/ticket29617 b/changes/ticket29617
@@ -0,0 +1,4 @@
+  o Minor bugfixes (out-of-memory handler):
+    - When purging the DNS cache because of an out-of-memory condition,
+      try purging just the older entries at first.  Previously, we would
+      purge the whole thing. Fixes bug 29617; bugfix on 0.3.5.1-alpha.
diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c
@@ -2130,7 +2130,8 @@ dns_cache_handle_oom(time_t now, size_t min_remove_bytes)
     current_size -= bytes_removed;
     total_bytes_removed += bytes_removed;
 
-    time_inc += 3600; /* Increase time_inc by 1 hour. */
+    /* Increase time_inc by a reasonable fraction. */
+    time_inc += (MAX_DNS_TTL_AT_EXIT / 4);
   } while (total_bytes_removed < min_remove_bytes);
 
   return total_bytes_removed;