commit 9da7d2448df2700d0d00e4d4c7de044c665a2817 Merge: ee64d76 968f29e Author: juga0 juga@riseup.net Date: Fri Dec 21 08:39:36 2018 +0000
Merge branch 'bug28602'
sbws/core/generate.py | 5 +++-- sbws/lib/v3bwfile.py | 4 ++-- tests/unit/core/test_generate.py | 34 ++++++++++++++++++++++++++++++++++ tests/unit/lib/test_v3bwfile.py | 21 ++++++++++++++------- 4 files changed, 53 insertions(+), 11 deletions(-)
tor-commits@lists.torproject.org