commit 77ea7105953bbf20cad284fcf247c80b1af67c8f
Merge: 1089053 f3c07f2
Author: Georg Koppen <g...@torproject.org>
Date: Tue May 4 13:06:08 2021 +0000
Merge branch 'm12'
sbws/globals.py | 2 +-
sbws/lib/resultdump.py | 4 ++--
tests/integration/conftest.py | 1 -
tests/unit/conftest.py | 1 -
4 files changed, 3 insertions(+), 5 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
