Merge branch 'bug15221_027'
commit4b02af452d12b35e58d3a8e5e7ef042970e26774
authorNick Mathewson <nickm@torproject.org>
Mon, 14 Mar 2016 18:10:47 +0000 (14 14:10 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 14 Mar 2016 18:10:47 +0000 (14 14:10 -0400)
tree8e378d07d31321b60d39a6f2cd82ddb257b499d7
parent36ad65a7d1709deeb4bc1ae3e994a30c3e7bf789
parent725e0c76e3df9d3ea4b861b3ff5279b23def4ef9
Merge branch 'bug15221_027'
src/common/sandbox.c