]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Mon, 30 Jul 2012 21:08:44 +0000 (17:08 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 30 Jul 2012 21:08:44 +0000 (17:08 -0400)
1  2 
evdns.c

diff --cc evdns.c
Simple merge