commit ba896c9ec0a3ba97b957ae5eae701ae688390e90 Merge: dd7ece2 40754a3 Author: Georg Koppen <gk@torproject.org> Date: Tue Jul 21 08:48:52 2020 +0000 Merge branch 'maint-1.1' into master sbws/lib/relaylist.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)