]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d2a0c4 e702962)
Merge remote-tracking branch 'teor/Bug-23966'
authorNick Mathewson <nickm@torproject.org>
Wed, 10 Jan 2018 14:38:38 +0000 (09:38 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 10 Jan 2018 14:38:38 +0000 (09:38 -0500)
1  2 
src/or/nodelist.c patch | diff1 | diff2 | blob | history

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