Commit 7a91f732beb72af5a7d8c6084e7a59ed5224c189

Nick Mathewson 2011-03-23T16:34:58

Merge remote branch 'origin/patches-2.0'