[tor-commits] [tor/master] Fix osx compilation again, hopefully better this time.