ElementsProject/lightning 2 pull requests

• Consider channel parameters before selecting for a route Aug 1
• contrib/short_channel_id-to-txid.sh: simple mapping util. Aug 17