Merge branch 'master' of github.com:jedisct1/libsodium

* 'master' of github.com:jedisct1/libsodium:
  Tweak emscripten-wasm.sh
  Clear the BLAKE2B state only once, on finalization
  memzero() the state if we call generichash_final() twice

src/libsodium/crypto_generichash/blake2b/ref/blake2b-ref.c

@@ -388,6 +388,9 @@ blake2b_final(blake2b_state *S, uint8_t *out, uint8_t outlen)
         memcpy(out, buffer, outlen);
     }
 #endif
+    sodium_memzero(S->h, sizeof S->h);
+    sodium_memzero(S->buf, sizeof S->buf);
+
     return 0;
 }