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

[nickm at torproject.org]

commit 084c857704209572ca3dc9ffe8c1213189e35442
Merge: e6602f5 de7e99f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 19 14:19:19 2013 -0400

    Merge remote-tracking branch 'origin/maint-0.2.4'

 changes/bug8031    |    7 +++++
 src/or/microdesc.c |   66 +++++++++++++++++++++++++++++++++-------------------
 2 files changed, 49 insertions(+), 24 deletions(-)