Merge pull request #1033 from sipa/wait

Condition variables instead of polling

diff --cc src/net.cpp
Simple merge

diff --cc src/util.cpp
Simple merge