aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-01-15 12:24:20 -0500
committerNick Mathewson <nickm@torproject.org>2019-01-15 12:24:20 -0500
commite1cb6341f97a18d362fe024b823dbd08b4724988 (patch)
tree2b9f4432a4fd2c71b013f53cb2bbd462b898c923
parentd8902c2e74845c5da5ab5066f57f22f8b209693a (diff)
parent09814d9109d801a9995890dbde0dcca1f5370683 (diff)
downloadtorspec-e1cb6341f97a18d362fe024b823dbd08b4724988.tar.gz
torspec-e1cb6341f97a18d362fe024b823dbd08b4724988.zip
Merge remote-tracking branch 'asn-github/bug28142'
-rw-r--r--proposals/254-padding-negotiation.txt16
-rw-r--r--tor-spec.txt6
2 files changed, 21 insertions, 1 deletions
diff --git a/proposals/254-padding-negotiation.txt b/proposals/254-padding-negotiation.txt
index 19ab6ce..087f060 100644
--- a/proposals/254-padding-negotiation.txt
+++ b/proposals/254-padding-negotiation.txt
@@ -178,7 +178,7 @@ following:
* For other bins, uniformly sample a time value between this bin and
the next bin, and schedule padding then.
-3.1.2 Histogram Token Removal
+3.1.1.1. Histogram Token Removal
Tokens can be optionally removed from histogram bins whenever a padding or
non-padding packet is sent. With this token removal, the histogram functions
@@ -211,6 +211,20 @@ start_usec+rtt_estimate+range_sec are treated as part of the bin before the
infinity bin. Tokens are not removed from the infinity bin when non-padding is
sent. (They are only removed when an "infinite" delay is chosen).
+3.1.2. Delay Probability Distribution
+
+Alternatively, a delay probability distribution can be used instead of a
+histogram, to sample padding delays.
+
+In this case, the designer also needs to specify the appropriate distribution
+parameters, and when a padding cell needs to be scheduled, the padding
+subsystem will sample a positive delay value (in microseconds) from that
+distribution (where the minimum delay is range_usec+start_usec as is the case
+for histograms).
+
+We currently support the following probability distributions:
+ Uniform, Logistic, Log-logistic, Geometric, Weibull, Pareto
+
3.2. State Machine Selection
Clients will select which of the defined available padding machines to use
diff --git a/tor-spec.txt b/tor-spec.txt
index 7204989..b2b26eb 100644
--- a/tor-spec.txt
+++ b/tor-spec.txt
@@ -2105,3 +2105,9 @@ see tor-design.pdf.
"1" -- consensus methods 9 through 20.
"2" -- consensus method 21 (adds ed25519 keys to microdescs).
+
+9.11. "Padding"
+
+ Describes the padding capabilities of the relay.
+
+ "1" -- Relay supports circuit-level padding.