]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9e5512b 7844c5d)
Merge remote-tracking branch 'public/ticket20921'
authorNick Mathewson <nickm@torproject.org>
Mon, 16 Jan 2017 17:59:39 +0000 (12:59 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 16 Jan 2017 17:59:39 +0000 (12:59 -0500)
1  2 
src/or/circuitlist.c patch | diff1 | diff2 | blob | history

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