Commit 4cb3f53a6bb26376e547ad14bf4fb17c7731a309

Nick Mathewson 2011-02-03T14:04:25

Merge remote branch 'origin/patches-2.0'