Merge pull request #401 from ariard/2019-11-log-tx-broadcast

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

Mon, 25 Nov 2019 22:39:48 +0000 (22:39 +0000)

committer GitHub <noreply@github.com>

Mon, 25 Nov 2019 22:39:48 +0000 (22:39 +0000)
author Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Mon, 25 Nov 2019 22:39:48 +0000 (22:39 +0000)
committer GitHub <noreply@github.com>
Mon, 25 Nov 2019 22:39:48 +0000 (22:39 +0000)
diff --cc lightning/src/ln/channelmanager.rs
Simple merge
diff --cc lightning/src/ln/channelmonitor.rs
Simple merge
author	Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
	Mon, 25 Nov 2019 22:39:48 +0000 (22:39 +0000)
committer	GitHub <noreply@github.com>
	Mon, 25 Nov 2019 22:39:48 +0000 (22:39 +0000)
		1	2
lightning/src/ln/channelmanager.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lightning/src/ln/channelmonitor.rs	patch \|	diff1 \|	diff2 \|	blob \| history