Merge pull request #2700 from Evanfeenstra/pub-htlc-routing