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

[juga at torproject.org]

commit 28f283269ddca633fb619f9314ebd3a4b85d8aa0
Merge: 0313645 ae74288
Author: juga0 <juga at riseup.net>
Date:   Tue Nov 20 13:39:41 2018 +0000

    Merge branch 'ticket28451'

 CHANGELOG.md                    |  2 ++
 sbws/core/generate.py           |  9 ++++-----
 sbws/globals.py                 |  1 +
 sbws/lib/v3bwfile.py            | 14 +++++++-------
 tests/unit/lib/test_v3bwfile.py | 12 ++++++++++--
 5 files changed, 24 insertions(+), 14 deletions(-)

diff --cc CHANGELOG.md
index d9a6c48,ce462aa..1615b5e
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -11,8 -11,8 +11,10 @@@ and this project adheres to [Semantic V
  
  - Make sbws round to 3 significant figures in torflow rounding mode, rather
    than rounding to the nearest 1000 kilobytes (#28442).
 +- Continue running with defaults when the config argument is provided
 +  but not found (#28500).
+ - Make sbws round to 2 significant figures by default. This implements part
+   of proposal 276 (#28451).
  
  ## [1.0.2] - 2018-11-10