Commit 2e5a175bf387bd5c80b88f276b4ba7dcf9eaaf08

Nick Mathewson 2010-11-25T23:03:46

Merge remote branch 'github/20_once_fixes'