Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Thu, 21 Apr 2011 21:36:30 +0000 (17:36 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 21 Apr 2011 21:36:30 +0000 (17:36 -0400)
commit34631be00c3d2d0e831708cc0e1f08dc92583961
treebce920569357a8dbfb800278f2b03d0eb4db461f
parent169eca7b58c0031c795b4f443fcccb3cdaac5b98
parentb4f89f00c607689d867a83d9d52535f371c5d750
Merge remote-tracking branch 'origin/patches-2.0'
evdns.c
evmap.c