Merge pull request #283 from TheBlueMatt/2019-01-htlc-resolution-log