]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7c1f33d 9827574)
Merge branch 'bug21394_029' into maint-0.3.2
authorNick Mathewson <nickm@torproject.org>
Sun, 5 Nov 2017 19:39:37 +0000 (14:39 -0500)
committerNick Mathewson <nickm@torproject.org>
Sun, 5 Nov 2017 19:39:37 +0000 (14:39 -0500)
1  2 
src/or/dns.c patch | diff1 | diff2 | blob | history

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