commit 4cc1216668d26fb209b480e898ec1f6ef8958d75 Merge: 4861f97 2ed67f3 Author: Matthew Finkel sysrqb@torproject.org Date: Mon Aug 24 18:56:34 2020 +0000

Merge remote-tracking branch 'gkgl/bug_40046_v2'

projects/go/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)