Commit b04d13cd72e28b105002dba1ba8001be68c42701

Nick Mathewson 2013-09-09T12:06:53

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