Commit 722207ff9e8b4ff06b2b3cc166294ca2e2340e50

Nick Mathewson 2011-06-21T10:07:04

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