aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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"