commit 8e05001dc60f6dc1e803f19e33cc2ccad12efc82 Merge: 33f86fa 9117b14 Author: Nick Mathewson nickm@torproject.org Date: Fri Mar 29 12:24:45 2013 -0400

Merge branch '0.2.4-lognoise-fixes-rebased' into maint-0.2.4

changes/log-noise | 11 +++++++++++ src/or/circuitbuild.c | 10 +++++----- src/or/connection_edge.c | 4 +++- src/or/dirvote.c | 4 ++-- src/or/dirvote.h | 3 +++ src/or/routerparse.c | 13 ++++++++++--- src/or/routerparse.h | 2 +- 7 files changed, 35 insertions(+), 12 deletions(-)