]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0d94f78 be76850)
Merge branch 'bug2574' into maint-0.2.1
authorNick Mathewson <nickm@torproject.org>
Sat, 28 May 2011 06:07:48 +0000 (02:07 -0400)
committerNick Mathewson <nickm@torproject.org>
Sat, 28 May 2011 06:07:48 +0000 (02:07 -0400)
1  2 
src/or/eventdns.c patch | diff1 | diff2 | blob | history

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