Commit 9ce5053d6e6c6642b24383ff6338cf796649a78c

Nick Mathewson 2011-12-06T11:02:12

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