[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'

[nickm at torproject.org]

commit c1a2be9ffe89423a71eb0d73ea108f22966fcfb0
Merge: c3cc79e 8e05001
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 29 12:26:01 2013 -0400

    Merge remote-tracking branch 'origin/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(-)