[tor-commits] [tor/master] Merge remote-tracking branch 'linus/bug5355_ln'

[nickm at torproject.org]

commit f1aae1236fc68a0047ac9370bdcf828a42efdab3
Merge: 155543d f998590
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 31 12:33:16 2012 -0400

    Merge remote-tracking branch 'linus/bug5355_ln'

 changes/bug5355     |    4 ++++
 src/common/compat.c |   43 +++++++++++++++++++++++++++++++++++++++----
 2 files changed, 43 insertions(+), 4 deletions(-)