# Merge pull request \#6809 from jedisct1/salsa · gitcafe/zig

[View on GitCafe](https://git.cafe/gitcafe/zig/commit/0088efc4b22645698faf328369a1deca2dc9070f)

Repository: [gitcafe/zig](https://git.cafe/gitcafe/zig)

Visibility: public

Requested revision: 0088efc4b22645698faf328369a1deca2dc9070f

Requested commit: 0088efc4b22645698faf328369a1deca2dc9070f

Commit: 0088efc4b22645698faf328369a1deca2dc9070f

Tree: 69f2fa8dd0325331f4a622bef8f545a18379e354

Author: Andrew Kelley

Committer: GitHub

## Message

```
Merge pull request #6809 from jedisct1/salsa

std/crypto: add (X)Salsa20 and NaCl boxes
```

## Parents

- [bbd1e122d443dce8342a82a91f529fdec0007d46](https://git.cafe/gitcafe/zig/commit/bbd1e122d443dce8342a82a91f529fdec0007d46?format=markdown)

- [0c7a99b38d2fb881cde5125ef0729ff0427c06a6](https://git.cafe/gitcafe/zig/commit/0c7a99b38d2fb881cde5125ef0729ff0427c06a6?format=markdown)

[Source at this commit](https://git.cafe/gitcafe/zig/tree/0088efc4b22645698faf328369a1deca2dc9070f?format=markdown)