]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 21ee765 cbc465a)
Merge remote-tracking branch 'ahf-oniongit/bugs/24362'
authorNick Mathewson <nickm@torproject.org>
Tue, 12 Dec 2017 14:18:52 +0000 (09:18 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 12 Dec 2017 14:18:52 +0000 (09:18 -0500)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/or/config.c patch | diff1 | diff2 | blob | history

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