commit 323cb655be7802a3f527bfa4278478d9fbd23944 Merge: 6f20a74 adfc3de Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 19 16:16:48 2013 -0400

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

changes/bug7164_diagnostic | 4 ++++ src/or/microdesc.c | 20 +++++++++++--------- src/or/microdesc.h | 4 +++- 3 files changed, 18 insertions(+), 10 deletions(-)