]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Thu, 21 Apr 2011 17:38:29 +0000 (13:38 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 21 Apr 2011 17:38:29 +0000 (13:38 -0400)
1  2 
evdns.c

diff --cc evdns.c
Simple merge