[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug8002' into maint-0.2.4

[nickm at torproject.org]

commit 8d29866bec821e188a411f78b8112d2097ed106c
Merge: de7e99f 22804c0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 19 14:26:45 2013 -0400

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

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