Merge branch 'master' of github.com:Atheros1/PyBitmessage
Merge branch 'master' of github.com:Atheros1/PyBitmessage
Merge branch 'master' of github.com:Bitmessage/PyBitmessage
Merge pull request #265 from Atheros1/master

Various changes. Now on PyBitmessage v0.3.4
Merge branch 'master' of github.com:Bitmessage/PyBitmessage
Fix issue #183 (CPU 100% usage)

As per http://docs.python.org/2/howto/sockets.html#using-a-socket it's
possible that a socket recv() call returns 0 bytes if the remote closes
the connection. In that case, recv() does not obey settimeout(): it
just doesn't block and returns zero bytes immediately, which in this
case results in an infinite loop if the transmission was incomplete.
Merge pull request #277 from pgimeno/cpu100percentfix

Fix issue #183 (CPU 100% usage)
Merge branch 'master' of github.com:Bitmessage/PyBitmessage