[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'

[nickm at torproject.org]

commit 96e8e30ee3ea805b933af63459656644f2c60911
Merge: c547502 323cb65
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 19 16:17:42 2013 -0400

    Merge remote-tracking branch 'origin/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(-)