]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8a38d05 d288704)
Merge branch 'maint-0.2.9'
authorNick Mathewson <nickm@torproject.org>
Wed, 26 Oct 2016 18:17:21 +0000 (14:17 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 26 Oct 2016 18:17:21 +0000 (14:17 -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