[tor-commits] [torspec/master] 271: Lower MAX_SAMPLE_THRESHOLD; add MAX_SAMPLE_SIZE

[nickm at torproject.org]

commit a5a4640a9544d20455efe96bc99a10e16c648eba
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 8 10:07:24 2016 -0500

    271: Lower MAX_SAMPLE_THRESHOLD; add MAX_SAMPLE_SIZE
    
    Specified fix for #20920
---
 proposals/271-another-guard-selection.txt | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/proposals/271-another-guard-selection.txt b/proposals/271-another-guard-selection.txt
index 87ba960..4da79ed 100644
--- a/proposals/271-another-guard-selection.txt
+++ b/proposals/271-another-guard-selection.txt
@@ -203,8 +203,9 @@ Status: Open
    We require that {SAMPLED_GUARDS} contain at least
    {MIN_FILTERED_SAMPLE} guards from the consensus (if possible),
    but not more than {MAX_SAMPLE_THRESHOLD} of the number of guards
-   in the consensus.  (But if the maximum would be smaller than
-   {MIN_FILTERED_SAMPLE}, we set the maximum at {MIN_FILTERED_SAMPLE}.)
+   in the consensus, and not more then {MAX_SAMPLE_SIZE} in total.
+   (But if the maximum would be smaller than {MIN_FILTERED_SAMPLE}, we
+   set the maximum at {MIN_FILTERED_SAMPLE}.)
 
    To add a new guard to {SAMPLED_GUARDS}, pick an entry at random
    from ({GUARDS} - {SAMPLED_GUARDS}), weighted by bandwidth.
@@ -601,7 +602,9 @@ A.1.  Parameters with suggested values. [Section:PARAM_VALS]
 
    (All suggested values chosen arbitrarily)
 
-   {param:MAX_SAMPLE_THRESHOLD} -- 30%
+   {param:MAX_SAMPLE_THRESHOLD} -- 20%
+
+   {param:MAX_SAMPLE_SIZE} -- 60
 
    {param:GUARD_LIFETIME} -- 120 days