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

[nickm at torproject.org]

commit b349f09b4763fb17bf77e3ed128996094d01ac84
Merge: a934376 33b7083
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 3 09:36:59 2013 -0400

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

 changes/bug8235-diagnosing |    5 +++++
 src/or/circuitbuild.c      |   40 +++++++++++++++++++++++++++++++++++++---
 src/or/entrynodes.c        |   30 ++++++++++++++++++++++++++++++
 3 files changed, 72 insertions(+), 3 deletions(-)