Commit 25fe382981ef419186b3e09178d4aea7ee5e8753

Nick Mathewson 2011-06-01T14:02:56

Merge remote-tracking branch 'github/master'