it turned out that scrub protection was buggy...

we should also be checking the primary key that it hasn't be scrubbed!
Merge branch 'header_v3' of github.com:keybase/triplesec into header_v3

Conflicts:
	browser/triplesec.js
	lib/enc.js
	src/enc.iced
	test/browser/test.js