[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug11233_diagnose'

[nickm at torproject.org]

commit c472ac4fb84a7977b53d2be051e8ddde15bba8f5
Merge: a2b59db 234dfb0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 1 12:37:16 2014 -0400

    Merge remote-tracking branch 'public/bug11233_diagnose'

 changes/bug11233  |    4 ++++
 src/common/util.c |    3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)