]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7ccb1c5 06484eb)
Merge branch 'bug21394_029_redux' into maint-0.3.3
authorNick Mathewson <nickm@torproject.org>
Wed, 4 Apr 2018 12:55:37 +0000 (08:55 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 4 Apr 2018 12:55:37 +0000 (08:55 -0400)
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