commit dd7ece27b6079bb10f65f367512cabe1e4af401c Merge: 0001f1a 16caca1 Author: Georg Koppen <gk@torproject.org> Date: Tue Jul 21 08:46:57 2020 +0000 Merge branch 'maint-1.1' into master sbws/globals.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)