Commit 26049c2f93e3266819d8456cb7481521b7b255fa

Nick Mathewson 2010-11-22T16:24:52

Merge remote branch 'github/20_getaddrinfo_cancel_v2'