]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-gitlab/mr/68' into maint-0.4.4
authorNick Mathewson <nickm@torproject.org>
Wed, 29 Jul 2020 16:35:57 +0000 (12:35 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 29 Jul 2020 16:35:57 +0000 (12:35 -0400)
1  2 
src/app/main/main.c
src/lib/sandbox/sandbox.c

Simple merge
Simple merge