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

[nickm at torproject.org]

commit 01af92fedead7589ac4272558d284e0e68de7ddd
Merge: 084c857 8d29866
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 19 14:27:00 2013 -0400

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

 changes/bug8002     |    5 +++++
 src/common/compat.c |   29 +++++++++++++++++++++++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)