Merge #1226

1226: Explicitly state our license in the README, use `OR` in Cargo.toml r=jtgeibel

Fixes #1225

Author: bors-voyager[bot]

Cargo.toml

@@ -2,7 +2,7 @@
 name = "cargo-registry"
 authors = ["Alex Crichton <[email protected]>"]
 version = "0.2.2"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-lang/crates.io"
 description = "Backend of crates.io"
 

README.md

@@ -57,3 +57,12 @@ categories will be synced from this file.
 ## Running a mirror
 
 Please see [docs/MIRROR.md](https://github.com/rust-lang/crates.io/blob/master/docs/MIRROR.md) for instructions on setting up a mirror of crates.io.
+
+## License
+
+Licensed under either of these:
+
+ * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
+   https://www.apache.org/licenses/LICENSE-2.0)
+ * MIT license ([LICENSE-MIT](LICENSE-MIT) or
+   https://opensource.org/licenses/MIT)

src/s3/Cargo.toml

@@ -3,7 +3,7 @@
 name = "cargo-registry-s3"
 version = "0.2.0"
 authors = ["Alex Crichton <[email protected]>"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-lang/crates.io"
 description = "Interaction between crates.io and S3 for storing crate files"