Merge pull request #320 from TheBlueMatt/2019-03-chan-send-rewrite

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

Mon, 22 Apr 2019 21:32:24 +0000 (17:32 -0400)

committer GitHub <noreply@github.com>

Mon, 22 Apr 2019 21:32:24 +0000 (17:32 -0400)
author Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Mon, 22 Apr 2019 21:32:24 +0000 (17:32 -0400)
committer GitHub <noreply@github.com>
Mon, 22 Apr 2019 21:32:24 +0000 (17:32 -0400)
diff --cc fuzz/fuzz_targets/chanmon_fail_consistency.rs
Simple merge
diff --cc src/ln/channel.rs
Simple merge
author	Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
	Mon, 22 Apr 2019 21:32:24 +0000 (17:32 -0400)
committer	GitHub <noreply@github.com>
	Mon, 22 Apr 2019 21:32:24 +0000 (17:32 -0400)
		1	2
fuzz/fuzz_targets/chanmon_fail_consistency.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/ln/channel.rs	patch \|	diff1 \|	diff2 \|	blob \| history