aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-06-18 14:12:40 -0400
committerNick Mathewson <nickm@torproject.org>2020-06-18 14:12:40 -0400
commit63af434a6951c7a6738f282378eb06172e27f37f (patch)
tree33414725bbcd41f100465812ef3845a66dc869be
parenta9fee222aca8bc921953cfe823d54b4a435adb70 (diff)
parentb418155587c44011ad68476da9a23e488889b20f (diff)
downloadtorspec-63af434a6951c7a6738f282378eb06172e27f37f.tar.gz
torspec-63af434a6951c7a6738f282378eb06172e27f37f.zip
Merge branch 'ticket33639'
-rw-r--r--control-spec.txt3
-rw-r--r--tor-spec.txt2
2 files changed, 4 insertions, 1 deletions
diff --git a/control-spec.txt b/control-spec.txt
index 6a7a8bf..e4da813 100644
--- a/control-spec.txt
+++ b/control-spec.txt
@@ -2241,6 +2241,9 @@
MEASUREMENT_EXPIRED (As "TIMEOUT", except that we had left the circuit
open for measurement purposes to see how long it
would take to finish.)
+ IP_NOW_REDUNDANT (Closing a circuit to an introduction point that
+ has become redundant, since some other circuit
+ opened in parallel with it has succeeded.)
The "REMOTE_REASON" field is provided only when we receive a DESTROY or
TRUNCATE cell, and only if extended events are enabled. It contains the
diff --git a/tor-spec.txt b/tor-spec.txt
index c073b1b..372f9d0 100644
--- a/tor-spec.txt
+++ b/tor-spec.txt
@@ -1458,7 +1458,7 @@ see tor-design.pdf.
6 -- CONNECTFAILED (Unable to reach relay.)
7 -- OR_IDENTITY (Connected to relay, but its OR identity was not
as expected.)
- 8 -- OR_CONN_CLOSED (The OR connection that was carrying this circuit
+ 8 -- CHANNEL_CLOSED (The OR connection that was carrying this circuit
died.)
9 -- FINISHED (The circuit has expired for being dirty or old.)
10 -- TIMEOUT (Circuit construction took too long)