Commit 044c41de84bdb5341daa8c64f44d7b3b0b000a9c

Nick Mathewson 2011-11-18T15:16:11

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