[tor-commits] [sbws/master] Merge branch 'ticket28379'

[juga@xxxxxxxxxxxxxx]

commit a62801fd04c1006f73fb68201e072240bfb4cf88
Merge: 17398ab a9df1f8
Author: juga0 <juga@xxxxxxxxxx>
Date:   Sat Nov 10 13:29:07 2018 +0000

    Merge branch 'ticket28379'

 CHANGELOG.md         | 1 +
 sbws/lib/v3bwfile.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --cc CHANGELOG.md
index b77b53d,2295ab7..bb67d7b
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -11,7 -11,7 +11,8 @@@ and this project adheres to [Semantic V
  
  ### Fixed
  
 -- Use 5 "=" characters as terminator in the bandwidth files (#28379).
 +- Update bandwidth file specification version in the `generator` (#28366).
++- Use 5 "=" characters as terminator in the bandwidth files (#28379)
  
  ### Changed
  
diff --cc sbws/lib/v3bwfile.py
index 2cc83e5,4268fb7..4930969
--- a/sbws/lib/v3bwfile.py
+++ b/sbws/lib/v3bwfile.py
@@@ -37,9 -37,9 +37,9 @@@ UNORDERED_KEYVALUES = EXTRA_ARG_KEYVALU
                        ['latest_bandwidth']
  # List of all the KeyValues currently being used to generate the file
  ALL_KEYVALUES = ['version'] + UNORDERED_KEYVALUES
- TERMINATOR = '===='
+ TERMINATOR = '====='
 -# Num header lines in v1.1.0 using all the KeyValues
 -NUM_LINES_HEADER_V110 = len(ALL_KEYVALUES) + 2
 +# Num header lines in v1.X.X using all the KeyValues
 +NUM_LINES_HEADER_V1 = len(ALL_KEYVALUES) + 2
  LINE_TERMINATOR = TERMINATOR + LINE_SEP
  
  # KeyValue separator in Bandwidth Lines

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits