Merge branch 'reexport-reqwest' into master

matrix_sdk/Cargo.toml

@@ -22,6 +22,7 @@ encryption = ["matrix-sdk-base/encryption", "dashmap"]
 sqlite_cryptostore = ["matrix-sdk-base/sqlite_cryptostore"]
 native-tls = ["reqwest/native-tls"]
 rustls-tls = ["reqwest/rustls-tls"]
+socks = ["reqwest/socks"]
 
 docs = ["encryption", "sqlite_cryptostore", "messages"]
 

matrix_sdk/src/lib.rs

@@ -24,6 +24,7 @@
 //! keys. If this is disabled and `encryption` support is enabled the keys will
 //! by default be stored only in memory and thus lost after the client is
 //! destroyed.
+//! * `socks`: Enables SOCKS support in reqwest, the default HTTP client.
 
 #![deny(
     missing_debug_implementations,