aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2023-10-19 12:22:04 -0400
committerNick Mathewson <nickm@torproject.org>2023-10-19 12:22:04 -0400
commit720d5a4c23477c8bd8a109b676c0eae516aad2c7 (patch)
tree7bf3e9123998732cb979c23f8ba3636826f0c747
parent1203b16c3ee15127f2f85e8e32d5024e122ceb8c (diff)
downloadtorspec-720d5a4c23477c8bd8a109b676c0eae516aad2c7.tar.gz
torspec-720d5a4c23477c8bd8a109b676c0eae516aad2c7.zip
Add conflux protover.
-rw-r--r--spec/tor-spec/subprotocol-versioning.md8
1 files changed, 8 insertions, 0 deletions
diff --git a/spec/tor-spec/subprotocol-versioning.md b/spec/tor-spec/subprotocol-versioning.md
index 3611c73..cdb9507 100644
--- a/spec/tor-spec/subprotocol-versioning.md
+++ b/spec/tor-spec/subprotocol-versioning.md
@@ -296,6 +296,14 @@ control features (version 0).
in tor 0.4.7.3-alpha.
```
+## "Conflux"
+
+Describes the communications mechanisms used to bundle circuits together,
+in order to split traffic across multiple paths.
+
+> TODO: This is not yet described here. For details see
+> [Proposal 329](./proposals/329).
+
<a id="tor-spec.txt-9.13"></a>
## "Datagram"