]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'tor-gitlab/mr/392' into maint-0.4.6
authorDavid Goulet <dgoulet@torproject.org>
Thu, 27 May 2021 14:01:44 +0000 (10:01 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Thu, 27 May 2021 14:01:44 +0000 (10:01 -0400)
1  2 
src/feature/control/control_getinfo.c
src/feature/dirclient/dirclient.c

Simple merge
Simple merge