]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 800dff1 293aca9)
Merge branch 'maint-0.2.9'
authorNick Mathewson <nickm@torproject.org>
Mon, 7 Nov 2016 16:02:15 +0000 (11:02 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 7 Nov 2016 16:02:15 +0000 (11:02 -0500)
1  2 
src/or/config.c patch | diff1 | diff2 | blob | history
src/or/directory.c patch | diff1 | diff2 | blob | history

diff --cc src/or/config.c
Simple merge
diff --cc src/or/directory.c
Simple merge
Mirror of https://git.torproject.org/tor.git