Merge pull request #957 from TheBlueMatt/2021-06-p2p-no-deadlock