Commit 18f24ef4d5233087ecf0500c0733f33e0296eb7d

Nick Mathewson 2011-04-23T02:31:59

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