Commit 09a8d23ad9d5d7040fa4f6f128ef871453ca12f3

Nick Mathewson 2012-11-16T10:44:57

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