[tor-commits] [tor/master] Merge branch 'bug7164_diagnose_harder_v2'

[nickm at torproject.org]

commit 2721246f5d20e34e3f32b3a062f08cedbd15e36d
Merge: cd15172 0389d4a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 27 14:26:21 2014 -0400

    Merge branch 'bug7164_diagnose_harder_v2'

 changes/bug7164_diagnose_harder |    6 +++++
 src/or/microdesc.c              |   52 ++++++++++++++++++++++++++++++++++++++-
 src/or/nodelist.c               |   19 ++++++++++++++
 src/or/nodelist.h               |    1 +
 4 files changed, 77 insertions(+), 1 deletion(-)