]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: edd427a 489628a)
Merge remote-tracking branch 'mikeperry/bug23101-mergeready-squashed'
authorNick Mathewson <nickm@torproject.org>
Fri, 19 Jan 2018 22:28:10 +0000 (17:28 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 19 Jan 2018 22:28:10 +0000 (17:28 -0500)
1  2 
src/or/config.c patch | diff1 | diff2 | blob | history
src/or/or.h patch | diff1 | diff2 | blob | history

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