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

[juga@xxxxxxxxxxxxxx]

commit cf4fe8a110de2b0bd0f495dde71e27dc041e09e9
Merge: 73c01a4 9adb58f
Author: juga0 <juga@xxxxxxxxxx>
Date:   Tue Oct 23 13:49:18 2018 +0000

    Merge branch 'ticket28076_rmlink_or_header'

 CHANGELOG.md          |  8 ++++++
 sbws/core/generate.py |  8 ++++--
 sbws/globals.py       |  1 +
 sbws/lib/v3bwfile.py  | 69 +++++++++++++++++++++++++++++++++++++++++++++++----
 4 files changed, 79 insertions(+), 7 deletions(-)

diff --cc CHANGELOG.md
index 90da685,7d0df92..76c66ab
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -16,9 -16,15 +16,17 @@@ and this project adheres to [Semantic V
  - Move ``examples/`` to ``docs/`` (#28040)
  - Number of results comparison and number of results away from each other are
    incorrect (#28041)
 +- Stop removing results that are not away from some other X secs (#28103)
 +- Use secs-away when provided instead of data_period (#28105)
  
+ ## Added
+ 
+ - Write bw file only when the percentage of measured relays is bigger than 60%
+   (#28062)
+ - When the percentage of measured relays is less than the 60%, do not include 
+   the relays in the bandwidth file and instead include some statistics in the 
+   header (#28076)
+ 
  ## [0.8.0] - 2018-10-08
  
  **Important changes**:
diff --cc sbws/lib/v3bwfile.py
index 8d0e193,f1a2d25..52eaec7
--- a/sbws/lib/v3bwfile.py
+++ b/sbws/lib/v3bwfile.py
@@@ -5,8 -5,8 +5,9 @@@
  import copy
  import logging
  import os
 +from itertools import combinations
  from statistics import median, mean
+ from stem.descriptor import parse_file
  
  from sbws import __version__
  from sbws.globals import (SPEC_VERSION, BW_LINE_SIZE, SBWS_SCALE_CONSTANT,



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