]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug15221_027'
authorNick Mathewson <nickm@torproject.org>
Mon, 14 Mar 2016 18:10:47 +0000 (14:10 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 14 Mar 2016 18:10:47 +0000 (14:10 -0400)
1  2 
src/common/sandbox.c

Simple merge