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

[juga at torproject.org]

commit 24a1a412a930905141f6d45706323efd7d011040
Merge: fe1be7b 565350c
Author: juga0 <juga at riseup.net>
Date:   Mon Oct 29 09:25:18 2018 +0000

    Merge branch 'ticket28061_priority'

 CHANGELOG.md         | 1 +
 sbws/core/scanner.py | 3 +++
 2 files changed, 4 insertions(+)

diff --cc CHANGELOG.md
index d16e18e,731a7e7..a9ac25d
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -11,8 -11,7 +11,9 @@@ and this project adheres to [Semantic V
  
  - Update python minimal version in setup (#28043)
  - Catch unhandled exception when we fail to resolve a domain name (#28141)
 +- Bandwidth filtered is the maximum between the bandwidth measurements and
 +  their mean, not the minimum (#28215)
+ - Stop measuring the same relay by two threads(#28061)
  
  ### Changed