瀏覽代碼

Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

Conflicts:
	src/or/microdesc.c
Nick Mathewson 10 年之前
父節點
當前提交
14bc6e8993
共有 2 個文件被更改,包括 7 次插入1 次删除
  1. 6 0
      changes/bug7164_downgrade
  2. 1 1
      src/or/microdesc.c

+ 6 - 0
changes/bug7164_downgrade

@@ -0,0 +1,6 @@
+  o Minor bugfixes:
+    - Downgrade the warning severity for the the "md was still referenced 1
+      node(s)" warning. Tor 0.2.5.4-alpha has better code for trying to
+      diagnose this bug, and the current warning in earlier versions of
+      tor achieves nothing useful. Addresses warning from bug 7164.
+

+ 1 - 1
src/or/microdesc.c

@@ -614,7 +614,7 @@ microdesc_free_(microdesc_t *md, const char *fname, int lineno)
         }
       });
     if (found) {
-      log_warn(LD_BUG, "microdesc_free() called from %s:%d, but md was still "
+      log_info(LD_BUG, "microdesc_free() called from %s:%d, but md was still "
                "referenced %d node(s); held_by_nodes == %u",
                fname, lineno, found, md->held_by_nodes);
     } else {