Commit 3ef4b3532f7068eec9536d5f36be312fbaff5844

Nick Mathewson 2012-04-03T17:27:07

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