Commit 1fda4928781d155dcef8c5ae158418bf8ee928ff

Nick Mathewson 2012-11-16T12:06:40

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