]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ae60840 69f93f8)
Merge remote-tracking branch 'public/bug23817_031' into maint-0.3.1
authorNick Mathewson <nickm@torproject.org>
Mon, 11 Dec 2017 21:45:54 +0000 (16:45 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 11 Dec 2017 21:45:54 +0000 (16:45 -0500)
1  2 
src/or/directory.c patch | diff1 | diff2 | blob | history
src/or/entrynodes.c patch | diff1 | diff2 | blob | history

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