[tor-commits] [fallback-scripts/master] update: Implement version 3.0.0 of the dir-list-spec

[teor at torproject.org]

commit 0a715b55abf1870415d0f538e6d44aa73838b1a1
Author: teor <teor at torproject.org>
Date:   Mon Dec 9 16:27:35 2019 +1000

    update: Implement version 3.0.0 of the dir-list-spec
    
    Change "source=whitelist" to "source=offer-list".
    
    Part of 32699 and 24839.
---
 updateFallbackDirs.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/updateFallbackDirs.py b/updateFallbackDirs.py
index 3cef7ff..25aa4c4 100755
--- a/updateFallbackDirs.py
+++ b/updateFallbackDirs.py
@@ -165,7 +165,7 @@ def custom_bool(raw_var_value, default_val, var_name=None):
 #   content
 # These variables are not configureable, because format changes need a spec
 # and code update.
-FALLBACK_FORMAT_VERSION = '2.0.0'
+FALLBACK_FORMAT_VERSION = '3.0.0'
 SECTION_SEPARATOR_BASE = '====='
 SECTION_SEPARATOR_COMMENT = '/* ' + SECTION_SEPARATOR_BASE + ' */'
 
@@ -2431,7 +2431,10 @@ def list_fallbacks(offer_list, exact=False):
   if offer_list['check_existing']:
       print "/* source=fallback */"
   else:
-      print "/* source=whitelist */"
+      # TODO: when we implement #24839, change this to descriptor,offer-list
+      # We might want add each key based on the size of the offer list, and
+      # the number of descriptors with offer-fallback-dir lines.
+      print "/* source=offer-list */"
   # end the header with a separator, to make it easier for parsers
   print SECTION_SEPARATOR_COMMENT