Merge https://github.com/BetterCrypto/Applied-Crypto-Hardening