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

[nickm at torproject.org]

commit b5edc838f283c50e8de378e3037a999736d9bbf4
Merge: b4bd836 cce85c8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 10 22:03:20 2011 -0400

    Merge remote-tracking branch 'sebastian/osxcompile'

 src/common/util.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)