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)
commitcc2cc04ad58404b9640322787a39686063c89997
treeac639a1b66529412069bd4116df5626f35e73418
parentd94d1c52ebf460e3c6cc4f507cecbfb138558516
parent9310813e9807ce390ceff25c42351c76ddaf9431
Merge branch 'master' of https://github.com/rust-bitcoin/rust-lightning into new-api-ping

pulling in changes from master