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

[nickm at torproject.org]

commit 483385d2bdd391db2ecbb775935554558dba7b56
Merge: 73ca1cf 72f775e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 13 21:59:27 2013 -0400

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

 changes/bug9047     |    6 ++++++
 src/common/compat.c |   15 +++++++++++++++
 src/common/compat.h |    1 +
 src/or/microdesc.c  |   19 +++++++++++++------
 4 files changed, 35 insertions(+), 6 deletions(-)