Merge branch 'master' of github.com:google/nsjail
authorRobert Swiecki <robert@swiecki.net>
Thu, 7 Jun 2018 12:59:32 +0000 (14:59 +0200)
committerRobert Swiecki <robert@swiecki.net>
Thu, 7 Jun 2018 12:59:32 +0000 (14:59 +0200)
1  2 
subproc.cc

diff --cc subproc.cc
Simple merge