]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 45caeec dc0d2b5)
Merge remote-tracking branch 'public/decouple_dir_request_failed'
authorNick Mathewson <nickm@torproject.org>
Wed, 25 Nov 2015 14:21:25 +0000 (09:21 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 25 Nov 2015 14:21:25 +0000 (09:21 -0500)
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