[tor-commits] [tor/master] Merge remote branch 'sebastian/osx_compile'

[nickm at torproject.org]

commit feaa0120d0d08591d3c9e720438d8f2fc34ed736
Merge: 9265164 303c041
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 24 09:27:04 2011 -0500

    Merge remote branch 'sebastian/osx_compile'

 src/or/status.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)