Commit 4df9b433054b4707aba0e9e285dadb4f05205f8c

Nick Mathewson 2011-06-08T17:38:17

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