add checksums (and trivial changes) from upstream#171

DaanHoogland wants to merge 4 commits intosofia-labshapeblue/Trillian:sofia-labfrom

test-with-checksumsshapeblue/Trillian:test-with-checksumsCopy head branch name to clipboard