diff options
| author | Roger Dingledine <arma@torproject.org> | 2010-09-29 17:17:59 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2010-09-29 17:17:59 -0400 |
| commit | 48cd096276590e40540bc255b2610931351b14cb (patch) | |
| tree | 31653a7ee4bdc1ec46328afe73e7738f7eee0302 /doc | |
| parent | 474e4d2722d52cf225a88cb7b7c677273b8f50ac (diff) | |
| parent | 4caf39f1c8db6acc25f84df024073d43c04c8645 (diff) | |
| download | tor-48cd096276590e40540bc255b2610931351b14cb.tar.gz tor-48cd096276590e40540bc255b2610931351b14cb.zip | |
Merge commit 'mikeperry/bug1739' into 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. |