diff options
| author | Roger Dingledine <arma@torproject.org> | 2010-09-29 17:21:43 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2010-09-29 17:21:43 -0400 |
| commit | 355fc63790bedfd00c062d6aa8d60f00307dc03f (patch) | |
| tree | 4d8f31bc6d0658ea08e9651bde3655dc8b3e266d /doc | |
| parent | 50720a9a4f8ea4433f3696d42d2f640ad970b285 (diff) | |
| parent | 48cd096276590e40540bc255b2610931351b14cb (diff) | |
| download | tor-355fc63790bedfd00c062d6aa8d60f00307dc03f.tar.gz tor-355fc63790bedfd00c062d6aa8d60f00307dc03f.zip | |
Merge branch 'maint-0.2.2'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/spec/control-spec.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/spec/control-spec.txt b/doc/spec/control-spec.txt index 31ce35074b..1864666047 100644 --- a/doc/spec/control-spec.txt +++ b/doc/spec/control-spec.txt @@ -1005,7 +1005,8 @@ Reason = "NONE" / "TORPROTOCOL" / "INTERNAL" / "REQUESTED" / "HIBERNATING" / "RESOURCELIMIT" / "CONNECTFAILED" / "OR_IDENTITY" / "OR_CONN_CLOSED" / "TIMEOUT" / - "FINISHED" / "DESTROYED" / "NOPATH" / "NOSUCHSERVICE" + "FINISHED" / "DESTROYED" / "NOPATH" / "NOSUCHSERVICE" / + "MEASUREMENT_EXPIRED" The path is provided only when the circuit has been extended at least one hop. |