diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-08-15 21:27:32 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-08-15 21:27:32 -0400 |
| commit | 9bcea4a8ef33bc3f1b66682a0eea463b891cd7ba (patch) | |
| tree | ae59b0189576acc89aad1fdb4e6a447989295dda /doc | |
| parent | 5757f47fc34235675d67b71c68b207582b245ca8 (diff) | |
| parent | 161b275028e90d38582c3cddf65d906e8a181368 (diff) | |
| download | tor-9bcea4a8ef33bc3f1b66682a0eea463b891cd7ba.tar.gz tor-9bcea4a8ef33bc3f1b66682a0eea463b891cd7ba.zip | |
Merge commit 'sebastian/misc-reason'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/spec/control-spec.txt | 2 | ||||
| -rw-r--r-- | doc/spec/tor-spec.txt | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/doc/spec/control-spec.txt b/doc/spec/control-spec.txt index 333b1a36a2..31ce35074b 100644 --- a/doc/spec/control-spec.txt +++ b/doc/spec/control-spec.txt @@ -1049,7 +1049,7 @@ Reason = "MISC" / "RESOLVEFAILED" / "CONNECTREFUSED" / "EXITPOLICY" / "DESTROY" / "DONE" / "TIMEOUT" / - "HIBERNATING" / "INTERNAL"/ "RESOURCELIMIT" / + "NOROUTE" / "HIBERNATING" / "INTERNAL"/ "RESOURCELIMIT" / "CONNRESET" / "TORPROTOCOL" / "NOTDIRECTORY" / "END" The "REASON" field is provided only for FAILED, CLOSED, and DETACHED diff --git a/doc/spec/tor-spec.txt b/doc/spec/tor-spec.txt index f448f6da2c..2b1223ba7a 100644 --- a/doc/spec/tor-spec.txt +++ b/doc/spec/tor-spec.txt @@ -835,7 +835,8 @@ see tor-design.pdf. 6 -- REASON_DONE (Anonymized TCP connection was closed) 7 -- REASON_TIMEOUT (Connection timed out, or OR timed out while connecting) - 8 -- (unallocated) [**] + 8 -- REASON_NOROUTE (Routing error while attempting to + contact destination) 9 -- REASON_HIBERNATING (OR is temporarily hibernating) 10 -- REASON_INTERNAL (Internal error at the OR) 11 -- REASON_RESOURCELIMIT (OR has no resources to fulfill request) @@ -857,8 +858,6 @@ see tor-design.pdf. [*] Older versions of Tor also send this reason when connections are reset. - [**] Due to a bug in versions of Tor through 0095, error reason 8 must - remain allocated until that version is obsolete. --- [The rest of this section describes unimplemented functionality.] |