#6 fix timeout
Merge branch 'develop' of https://github.com/qmule/libed2k into develop