]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/bug18253'
authorNick Mathewson <nickm@torproject.org>
Tue, 22 Mar 2016 14:08:50 +0000 (10:08 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 22 Mar 2016 14:08:50 +0000 (10:08 -0400)
1  2 
src/common/sandbox.c
src/or/connection.c
src/or/main.c

Simple merge
Simple merge
diff --cc src/or/main.c
Simple merge