]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eccef6b 848ba26)
Merge branch 'maint-0.2.9' into maint-0.3.1
authorNick Mathewson <nickm@torproject.org>
Sun, 11 Feb 2018 23:09:35 +0000 (18:09 -0500)
committerNick Mathewson <nickm@torproject.org>
Sun, 11 Feb 2018 23:09:35 +0000 (18:09 -0500)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/common/sandbox.c patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc src/common/sandbox.c
Simple merge
Mirror of https://git.torproject.org/tor.git