From 034c5ba9f50e347052f634a532d72b2d51ddb8a9 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 17 Feb 2022 12:19:33 -0500
Subject: [PATCH] Rename ExitTimeout to RemoteNetworkTimeout.

---
 crates/arti-client/src/err.rs   | 2 +-
 crates/arti/src/proxy.rs        | 2 +-
 crates/tor-dirclient/src/err.rs | 2 +-
 crates/tor-error/src/lib.rs     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/arti-client/src/err.rs b/crates/arti-client/src/err.rs
index 17287de0f..c22206782 100644
--- a/crates/arti-client/src/err.rs
+++ b/crates/arti-client/src/err.rs
@@ -232,7 +232,7 @@ impl tor_error::HasKind for ErrorDetail {
         use ErrorKind as EK;
         match self {
             E::ObtainExitCircuit { cause, .. } => cause.kind(),
-            E::ExitTimeout => EK::ExitTimeout,
+            E::ExitTimeout => EK::RemoteNetworkTimeout,
             E::BootstrapRequired { .. } => EK::BootstrapRequired,
             E::CircMgrSetup(e) => e.kind(),
             E::DirMgr(e) => e.kind(),
diff --git a/crates/arti/src/proxy.rs b/crates/arti/src/proxy.rs
index 11da207d3..6258dc335 100644
--- a/crates/arti/src/proxy.rs
+++ b/crates/arti/src/proxy.rs
@@ -198,7 +198,7 @@ where
                     // send an error.  See what kind it is.
                     //
                     let reply = match e.kind() {
-                        ErrorKind::ExitTimeout => {
+                        ErrorKind::RemoteNetworkTimeout => {
                             request.reply(tor_socksproto::SocksStatus::TTL_EXPIRED, None)
                         }
                         _ => request.reply(tor_socksproto::SocksStatus::GENERAL_FAILURE, None),
diff --git a/crates/tor-dirclient/src/err.rs b/crates/tor-dirclient/src/err.rs
index 2cb45f319..94772cd3c 100644
--- a/crates/tor-dirclient/src/err.rs
+++ b/crates/tor-dirclient/src/err.rs
@@ -92,7 +92,7 @@ impl HasKind for Error {
         use Error as E;
         use ErrorKind as EK;
         match self {
-            E::DirTimeout => EK::ExitTimeout,
+            E::DirTimeout => EK::RemoteNetworkTimeout,
             E::TruncatedHeaders => EK::TorProtocolViolation,
             E::HttpStatus(_) => EK::RemoteRefused,
             E::ResponseTooLong(_) => EK::TorProtocolViolation,
diff --git a/crates/tor-error/src/lib.rs b/crates/tor-error/src/lib.rs
index baaba93a8..b4d2dc276 100644
--- a/crates/tor-error/src/lib.rs
+++ b/crates/tor-error/src/lib.rs
@@ -199,7 +199,7 @@ pub enum ErrorKind {
     ///
     /// In either case, trying later, or on a different circuit, might help.  
     #[display(fmt = "operation timed out at exit")]
-    ExitTimeout,
+    RemoteNetworkTimeout,
 
     /// One or more configuration values were invalid or incompatible.
     ///