Commit f5b937e65fdb85dda0d815a164e9bd3fa3cc9684

Nick Mathewson 2011-11-14T18:22:08

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