Merge branch 'master' of https://github.com/rust-bitcoin/rust-lightning into new...
authorAleru <Aleru_0@protonmail.com>
Mon, 30 Dec 2019 20:03:48 +0000 (15:03 -0500)
committerAleru <Aleru_0@protonmail.com>
Mon, 30 Dec 2019 20:03:48 +0000 (15:03 -0500)
pulling in changes from master


Trivial merge