Commit a86a0c0463fabbb3ebca65fae789f2e90b314c34

Nick Mathewson 2012-01-16T14:47:05

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