]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug20710_025' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Wed, 7 Dec 2016 15:52:12 +0000 (10:52 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 7 Dec 2016 15:52:12 +0000 (10:52 -0500)
1  2 
src/common/sandbox.c

Simple merge