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 | da98b9bdb2c1272e6a9f60c4ad708dc09053990f (patch) | |
| tree | 62a332af0cc22fcfcafce98de21eaac3e0436c40 | |
| parent | f2d9a85778c961648ee75e6e980b40b4c11c8ed9 (diff) | |
| parent | 73f533432e66fb1317b9fb1c821a66cb05768491 (diff) | |
| download | torspec-da98b9bdb2c1272e6a9f60c4ad708dc09053990f.tar.gz torspec-da98b9bdb2c1272e6a9f60c4ad708dc09053990f.zip | |
Merge commit 'mikeperry/bug1739' into maint-0.2.2
| -rw-r--r-- | control-spec.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/control-spec.txt b/control-spec.txt index 31ce350..1864666 100644 --- a/control-spec.txt +++ b/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. |