Merge branch 'master' into develop

This commit is contained in:
Isis Lovecruft 2018-01-20 01:06:14 +00:00
commit cc30328fbb
Failed to extract signature

View file

@ -1,6 +1,6 @@
[package] [package]
name = "curve25519-dalek" name = "curve25519-dalek"
version = "0.14.2" version = "0.14.3"
authors = ["Isis Lovecruft <isis@patternsinthevoid.net>", authors = ["Isis Lovecruft <isis@patternsinthevoid.net>",
"Henry de Valence <hdevalence@hdevalence.ca>"] "Henry de Valence <hdevalence@hdevalence.ca>"]
readme = "README.md" readme = "README.md"
@ -25,7 +25,7 @@ rustdoc-args = ["--html-in-header", ".cargo/registry/src/github.com-1ecc6299db9e
travis-ci = { repository = "dalek-cryptography/curve25519-dalek", branch = "master"} travis-ci = { repository = "dalek-cryptography/curve25519-dalek", branch = "master"}
[dependencies.stdsimd] [dependencies.stdsimd]
git = "https://github.com/rust-lang-nursery/stdsimd" version = "0.0.4"
optional = true optional = true
[dependencies.serde] [dependencies.serde]
@ -65,7 +65,7 @@ arrayref = "0.3.4"
clear_on_drop = "=0.2.3" clear_on_drop = "=0.2.3"
[build-dependencies.stdsimd] [build-dependencies.stdsimd]
git = "https://github.com/rust-lang-nursery/stdsimd" version = "0.0.4"
optional = true optional = true
[build-dependencies.serde] [build-dependencies.serde]