Commit 169eca7b58c0031c795b4f443fcccb3cdaac5b98

Nick Mathewson 2011-04-21T13:38:29

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