am 8f9e859a: am 8cdf7206: (-s ours) Merge "Change transfer list format to include block hashes"

* commit '8f9e859a16303dc854ff20489406fadbf27d5bba':
  Change transfer list format to include block hashes