]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba87f5b b79d859)
Merge remote-tracking branch 'karsten/task-18460-2' into maint-0.2.8
authorNick Mathewson <nickm@torproject.org>
Fri, 1 Apr 2016 12:10:58 +0000 (08:10 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 1 Apr 2016 12:10:58 +0000 (08:10 -0400)
1  2 
src/or/directory.c patch | diff1 | diff2 | blob | history

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