commit 5efe5067670960384f0e4a42b5073e86fe3824a7 Merge: 856d575 3207ace Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 3 09:35:57 2013 -0400

Merge remote-tracking branch 'public/bug8235-diagnostic-rebased' into maint-0.2.4

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