Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Wed, 25 May 2011 20:52:50 +0000 (16:52 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 25 May 2011 20:52:50 +0000 (16:52 -0400)
1  2 
evdns.c
evmap.c

diff --cc evdns.c
Simple merge
diff --cc evmap.c
Simple merge