neaten whitespace
Might as well switch private key passphrase storage to the try-update-then-add technique.
Merge remote-tracking branch 'upstream/for-iOS' into for-iOS