Commit 5419803d3abcd9705b71cb98223dc00709ed5b33

Nick Mathewson 2011-08-08T22:04:46

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