commit a5036d20cee159689f06cd9832bb0a21dcff888e Merge: 173a1af 562299d Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 11 09:22:46 2014 -0400

Merge remote-tracking branch 'public/more_bug8387_diagnosis'

changes/more_8387_diagnosis | 4 +++ src/or/circuituse.c | 64 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 65 insertions(+), 3 deletions(-)