Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/bn/mod.rs

1 files changed, 11 insertions, 5 deletions

diff --git a/src/lib.rs b/src/lib.rs
index 3e0f3b92..c89010ba 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,14 +1,20 @@
-#![feature(struct_variant, macro_rules)]
+#![feature(macro_rules, unsafe_destructor, globs)]
 #![crate_name="openssl"]
 #![crate_type="rlib"]
 #![crate_type="dylib"]
-#![doc(html_root_url="http://www.rust-ci.org/sfackler/rust-openssl/doc")]
+#![doc(html_root_url="https://sfackler.github.io/doc/openssl")]
 
 extern crate libc;
 #[cfg(test)]
 extern crate serialize;
-extern crate sync;
 
-pub mod ssl;
-pub mod crypto;
+extern crate "openssl-sys" as ffi;
+
+mod macros;
+
+pub mod asn1;
 pub mod bn;
+pub mod bio;
+pub mod crypto;
+pub mod ssl;
+pub mod x509;