Merge branch 'keepnode' of https://github.com/TheBlueMatt/bitcoin