Commit 128c8d6c0f684b95a98358805eb91e1384dcb050

Nick Mathewson 2011-10-19T22:44:33

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