tor

commit e81896adda197b705958bcbe2b9d2c5db839b8a5
parent ee5c624bebbc8e823ed49fe563fd56294fb226d4
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 31 Jan 2018 09:50:24 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2

Diffstat:
A
changes/bug24859
 | 
4
++++
M
src/or/consdiffmgr.c
 | 
5
++++-

2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/changes/bug24859 b/changes/bug24859
@@ -0,0 +1,4 @@
+  o Minor bugfixes (logging):
+    - Don't treat inability to store a cached consensus object as a
+      bug: it can happen normally when we are out of disk space.
+      Fixes bug 24859; bugfix on 0.3.1.1-alpha.
diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c
@@ -1310,8 +1310,11 @@ store_multiple(consensus_cache_entry_handle_t **handles_out,
                             labels,
                             body_out,
                             bodylen_out);
-      if (BUG(ent == NULL))
+      if (ent == NULL) {
+        log_warn(LD_FS, "Unable to store object %s compressed with %s.",
+                 description, methodname);
         continue;
+      }
 
       status = CDM_DIFF_PRESENT;
       handles_out[i] = consensus_cache_entry_handle_new(ent);