commit 683b80bf815814f8c13f627aadc92267d009693e Merge: c948bda a06044a Author: Nick Mathewson nickm@torproject.org Date: Wed May 7 22:52:44 2014 -0400

Merge remote-tracking branch 'public/bug11737_diagnostic'

changes/bug11737_diagnostic | 5 +++++ src/or/microdesc.c | 18 ++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-)