Merge branch 'master' of https://github.com/rust-bitcoin/rust-lightning into new...
authorAleru <Aleru_0@protonmail.com>
Mon, 9 Dec 2019 18:39:30 +0000 (13:39 -0500)
committerAleru <Aleru_0@protonmail.com>
Mon, 9 Dec 2019 18:39:30 +0000 (13:39 -0500)
combine changes


Trivial merge