Merge remote-tracking branch 'tor-gitlab/mr/68' into maint-0.4.4
commit8c92d44622263d5d57a794a9bd1d8f78eb532a73
authorNick Mathewson <nickm@torproject.org>
Wed, 29 Jul 2020 16:35:57 +0000 (29 12:35 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 29 Jul 2020 16:35:57 +0000 (29 12:35 -0400)
tree04e6541fba4d135cf0b13785a8df6e4639278466
parent8e690ce736b3c61a1f007df4a1cd542e97e602c5
parenteab8e7af522d18620450003667579eebaa339896
Merge remote-tracking branch 'tor-gitlab/mr/68' into maint-0.4.4
src/app/main/main.c
src/lib/sandbox/sandbox.c