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

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