summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arti/Cargo.toml2
-rw-r--r--tor-client/Cargo.toml2
-rw-r--r--tor-client/src/lib.rs6
3 files changed, 7 insertions, 3 deletions
diff --git a/arti/Cargo.toml b/arti/Cargo.toml
index 275f04138..38a80ce78 100644
--- a/arti/Cargo.toml
+++ b/arti/Cargo.toml
@@ -16,7 +16,7 @@ async-std = [ "tor-client/async-std", "tor-rtcompat/async-std" ]
tokio = [ "tor-client/tokio", "tor-rtcompat/tokio" ]
[dependencies]
-tor-client = { path = "../tor-client", version="0.0.0" }
+tor-client = { package="arti-tor-client", path = "../tor-client", version="0.0.0" }
tor-dirmgr = { path="../tor-dirmgr", version="0.0.0" }
tor-rtcompat = { path="../tor-rtcompat", version="0.0.0", default-features=false }
tor-socksproto = { path="../tor-socksproto", version="0.0.0" }
diff --git a/tor-client/Cargo.toml b/tor-client/Cargo.toml
index 4a6336a91..f3a36c5d4 100644
--- a/tor-client/Cargo.toml
+++ b/tor-client/Cargo.toml
@@ -1,5 +1,5 @@
[package]
-name = "tor-client"
+name = "arti-tor-client"
version = "0.0.0"
authors = ["The Tor Project, Inc.", "Nick Mathewson <[email protected]>"]
edition = "2018"
diff --git a/tor-client/src/lib.rs b/tor-client/src/lib.rs
index cb52c7afc..ea1328a71 100644
--- a/tor-client/src/lib.rs
+++ b/tor-client/src/lib.rs
@@ -1,8 +1,12 @@
//! High-level functionality for accessing the Tor network as a client.
//!
+//! (Note that this crate is called `tor-client` in some other places,
+//! since we didn't know about the conflict with `tor_client`. We will
+//! clean all of this up somehow before the next release.)
+//!
//! # Overview
//!
-//! The `tor-client` crate aims to provide a safe, easy-to-use API for
+//! The `arti-tor-client` crate aims to provide a safe, easy-to-use API for
//! applications that want to use Tor network to anonymize their
//! traffic. It hides most of the underlying detail, letting other
//! crates decide how exactly to use the Tor crate.