summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2009-07-28 18:19:57 -0400
committerRoger Dingledine <arma@torproject.org>2009-07-28 18:19:57 -0400
commite8e88922a789e3317c881521110bfa9a7bdce597 (patch)
tree58180b8ab702ae5968135f8727065c7b3baea84a /doc
parent7b716878cb6837756bd65ed788e5d8d89d8af56c (diff)
parent69706f99e80aec9414e6a54e76346d4cf89f1a4c (diff)
downloadtor-e8e88922a789e3317c881521110bfa9a7bdce597.tar.gz
tor-e8e88922a789e3317c881521110bfa9a7bdce597.zip
Merge branch 'maint-0.2.1' into master
Diffstat (limited to 'doc')
-rw-r--r--doc/spec/tor-spec.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/spec/tor-spec.txt b/doc/spec/tor-spec.txt
index 9ae22a92d7..efa6029f22 100644
--- a/doc/spec/tor-spec.txt
+++ b/doc/spec/tor-spec.txt
@@ -660,8 +660,11 @@ see tor-design.pdf.
is speaking v2 of the link protocol or later, the OR relays the cell as a
RELAY_EARLY cell. Otherwise, it relays it as a RELAY cell.
- If a node ever receives more than 8 RELAY_EARLY cells on a given circuit,
- it SHOULD close the circuit.
+ If a node ever receives more than 8 RELAY_EARLY cells on a given
+ outbound circuit, it SHOULD close the circuit. (For historical reasons,
+ we don't limit the number of inbound RELAY_EARLY cells; they should
+ be harmless anyway because clients won't accept extend requests. See
+ bug 1038.)
When speaking v2 of the link protocol or later, clients MUST only send
EXTEND cells inside RELAY_EARLY cells. Clients SHOULD send the first ~8