Merge pull request #892 from TheBlueMatt/2021-04-fix-htlc-ser

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

Mon, 31 May 2021 23:52:22 +0000 (23:52 +0000)

committer GitHub <noreply@github.com>

Mon, 31 May 2021 23:52:22 +0000 (23:52 +0000)
author Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Mon, 31 May 2021 23:52:22 +0000 (23:52 +0000)
committer GitHub <noreply@github.com>
Mon, 31 May 2021 23:52:22 +0000 (23:52 +0000)
diff --cc fuzz/src/full_stack.rs
Simple merge
diff --cc lightning/src/ln/channel.rs
Simple merge
author	Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
	Mon, 31 May 2021 23:52:22 +0000 (23:52 +0000)
committer	GitHub <noreply@github.com>
	Mon, 31 May 2021 23:52:22 +0000 (23:52 +0000)
		1	2
fuzz/src/full_stack.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lightning/src/ln/channel.rs	patch \|	diff1 \|	diff2 \|	blob \| history