[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug5112'

[nickm at torproject.org]

commit 6f5a74002ac6406ebe602a3d8d36d251bd217df4
Merge: 3e4ccbc 077b9f1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 24 11:14:22 2012 -0400

    Merge remote-tracking branch 'public/bug5112'

 changes/bug5112     |    5 ++
 src/common/compat.c |  133 ++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 94 insertions(+), 44 deletions(-)