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

[juga at torproject.org]

commit f173396892c7d5f83d89c140fc6554c823b65412
Merge: 051773e 5105313
Author: juga0 <juga at riseup.net>
Date:   Fri Feb 15 17:42:36 2019 +0000

    Merge branch 'bug29295'

 sbws/lib/circuitbuilder.py                   | 48 +++++++++-------------------
 tests/integration/lib/test_circuitbuilder.py | 19 +++++++++++
 2 files changed, 34 insertions(+), 33 deletions(-)