Handle connection reset and don't block when killing peers
Don't send peerName when dying
Merge remote-tracking branch 'origin/master'