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

[juga at torproject.org]

commit b4cfac81a0def4e135483bd671777318774e6ce0
Merge: e32676c c6a7a94
Author: juga0 <juga at riseup.net>
Date:   Fri Dec 21 09:11:41 2018 +0000

    Merge branch 'ticket28670'

 .travis.yml |  7 ++++++-
 tox.ini     | 14 ++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)