aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--control-spec.txt9
-rw-r--r--tor-spec.txt2
2 files changed, 8 insertions, 3 deletions
diff --git a/control-spec.txt b/control-spec.txt
index 0f964ae..ffe862c 100644
--- a/control-spec.txt
+++ b/control-spec.txt
@@ -930,6 +930,11 @@ $Id$
"650" SP "ADDRMAP" SP Address SP Address SP Expiry
Expiry = DQOUTE ISOTime DQUOTE / "NEVER"
+ [XXX We should rename this to ADDRESSMAP. -RD]
+
+ [FFF We should add a SOURCE=%s argument for extended events,
+ which specifies what exit node told us this addressmap. -RD]
+
4.1.8. Descriptors uploaded to us in our role as authoritative dirserver
Syntax:
@@ -966,10 +971,10 @@ $Id$
CLOCK_JUMPED
"time=NUM"
Tor spent enough time without CPU cycles that it has closed all
- its circuits and will establishing them anew. This typically
+ its circuits and will establish them anew. This typically
happens when a laptop goes to sleep and then wakes up again. It
also happens when the system is swapping so heavily that Tor is
- starving. The "time" argument includes the number of seconds Tor
+ starving. The "time" argument specifies the number of seconds Tor
thinks it was unconscious for.
This status event is sent as NOTICE severity normally, but WARN
severity if Tor is acting as a server currently.
diff --git a/tor-spec.txt b/tor-spec.txt
index 2ebd350..1f18f19 100644
--- a/tor-spec.txt
+++ b/tor-spec.txt
@@ -282,7 +282,7 @@ TODO:
are able and willing to support. Parties can only communicate if they
have some connection protocol version in common.
- Version 0.1.2.0-alpha and earlier don't understand VERSIONS cells,
+ Version 0.1.x.y-alpha and earlier don't understand VERSIONS cells,
and therefore don't support version negotiation. Thus, waiting until
the other side has sent a VERSIONS cell won't work for these servers:
if they send no cells back, it is impossible to tell whether they