Commit 9c71a3413ab8f52797e504fdbd9ab52ff88f951a

Nick Mathewson 2010-10-25T15:13:32

Merge remote branch 'github/http_and_listener'