commit 856d57531b3173ef04a9f8f69c5e6e6c16c25c00 Merge: 2c15506 452cfaa Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 2 10:41:14 2013 -0400

Merge remote-tracking branch 'public/bug7707_diagnostic' into maint-0.2.4

changes/bug7707_diagnostic | 5 +++++ src/common/tortls.c | 25 +++++++++++++++++++++++++ src/common/tortls.h | 2 ++ src/or/status.c | 6 ++++++ 4 files changed, 38 insertions(+), 0 deletions(-)