Commit 2cbe115cbcdd47d954fa47a96c206c5c6ee63ddc

Nick Mathewson 2011-08-24T16:17:56

Merge remote-tracking branch 'origin/patches-2.0'