summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-09-15 14:20:28 -0400
committerNick Mathewson <nickm@torproject.org>2010-09-15 14:20:28 -0400
commitc18bcc8a55dfaef21637b9f6f38d05610b6ab50c (patch)
treeea584ae1eda6d6dd34b7537bbb9f75af15dbc4ba /doc
parent6d8fc4eb3866122ef42f209cc51a875a3e438607 (diff)
parent69508d04a2db530c0bbb4c1cc421e6b258b822be (diff)
downloadtor-c18bcc8a55dfaef21637b9f6f38d05610b6ab50c.tar.gz
tor-c18bcc8a55dfaef21637b9f6f38d05610b6ab50c.zip
Merge branch 'bug1184'
Diffstat (limited to 'doc')
-rw-r--r--doc/spec/tor-spec.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/spec/tor-spec.txt b/doc/spec/tor-spec.txt
index 2b1223ba7a..91ad561b8d 100644
--- a/doc/spec/tor-spec.txt
+++ b/doc/spec/tor-spec.txt
@@ -597,6 +597,14 @@ see tor-design.pdf.
cell to the next node in the circuit, and replies to the OP with a
RELAY_TRUNCATED cell.
+ [Note: If an OR receives a TRUNCATE cell and it has any RELAY cells
+ still queued on the circuit for the next node it will drop them
+ without sending them. This is not considered conformant behavior,
+ but it probably won't get fixed until a later version of Tor. Thus,
+ clients SHOULD NOT send a TRUNCATE cell to a node running any current
+ version of Tor if a) they have sent relay cells through that node,
+ and b) they aren't sure whether those cells have been sent on yes.]
+
When an unrecoverable error occurs along one connection in a
circuit, the nodes on either side of the connection should, if they
are able, act as follows: the node closer to the OP should send a