]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'config_subsys_v4'
authorNick Mathewson <nickm@torproject.org>
Thu, 7 Nov 2019 13:59:42 +0000 (08:59 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 7 Nov 2019 13:59:42 +0000 (08:59 -0500)

Trivial merge