]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2e9e91e e35eb9b)
Merge branch 'bug25617_029' into maint-0.3.3
authorNick Mathewson <nickm@torproject.org>
Thu, 29 Mar 2018 18:58:58 +0000 (14:58 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 29 Mar 2018 18:58:58 +0000 (14:58 -0400)
1  2 
src/or/dnsserv.c patch | diff1 | diff2 | blob | history

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