Merge pull request #451 from lightning-signer/txkeys

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

Mon, 20 Jan 2020 03:46:00 +0000 (03:46 +0000)

committer GitHub <noreply@github.com>

Mon, 20 Jan 2020 03:46:00 +0000 (03:46 +0000)
author Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Mon, 20 Jan 2020 03:46:00 +0000 (03:46 +0000)
committer GitHub <noreply@github.com>
Mon, 20 Jan 2020 03:46:00 +0000 (03:46 +0000)
diff --cc fuzz/src/full_stack.rs
Simple merge
diff --cc lightning/src/ln/chan_utils.rs
Simple merge
diff --cc lightning/src/ln/channel.rs
Simple merge
author	Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
	Mon, 20 Jan 2020 03:46:00 +0000 (03:46 +0000)
committer	GitHub <noreply@github.com>
	Mon, 20 Jan 2020 03:46:00 +0000 (03:46 +0000)
		1	2
fuzz/src/full_stack.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lightning/src/ln/chan_utils.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lightning/src/ln/channel.rs	patch \|	diff1 \|	diff2 \|	blob \| history