Merge branch 'txn_block_info' of https://github.com/luke-jr/bitcoin