commit 14bc6e8993c694702f5ab637c36b962f396660a5 Merge: efab348 6a4f5d9 Author: Nick Mathewson nickm@torproject.org Date: Thu May 1 11:44:25 2014 -0400

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

Conflicts: src/or/microdesc.c

changes/bug7164_downgrade | 6 ++++++ src/or/microdesc.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)

diff --cc src/or/microdesc.c index 90ac0ac,4acec6a..0e72c0b --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@@ -614,13 -561,11 +614,13 @@@ microdesc_free_(microdesc_t *md, const } }); if (found) { - log_warn(LD_BUG, "microdesc_free() called from %s:%d, but md was still " - log_info(LD_BUG, "microdesc_free() called, but md was still referenced " - "%d node(s); held_by_nodes == %u", found, md->held_by_nodes); ++ 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 { - log_warn(LD_BUG, "microdesc_free() called with held_by_nodes set to %u, " - "but md was not referenced by any nodes", md->held_by_nodes); + log_warn(LD_BUG, "microdesc_free() called from %s:%d with held_by_nodes " + "set to %u, but md was not referenced by any nodes", + fname, lineno, md->held_by_nodes); } tor_fragile_assert(); }