Merge pull request #1137 from TheBlueMatt/2021-10-ping-fixes

author Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>

Thu, 28 Oct 2021 20:57:21 +0000 (20:57 +0000)

committer GitHub <noreply@github.com>

Thu, 28 Oct 2021 20:57:21 +0000 (20:57 +0000)
author Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Thu, 28 Oct 2021 20:57:21 +0000 (20:57 +0000)
committer GitHub <noreply@github.com>
Thu, 28 Oct 2021 20:57:21 +0000 (20:57 +0000)
diff --cc lightning/src/ln/peer_handler.rs
Simple merge
diff --cc lightning/src/util/test_utils.rs
Simple merge
author	Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
	Thu, 28 Oct 2021 20:57:21 +0000 (20:57 +0000)
committer	GitHub <noreply@github.com>
	Thu, 28 Oct 2021 20:57:21 +0000 (20:57 +0000)
		1	2
lightning/src/ln/peer_handler.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lightning/src/util/test_utils.rs	patch \|	diff1 \|	diff2 \|	blob \| history