Update to 6.0.4

@karlitschek The links for the GPG keys for Unix / Windows are broken. What should they be?