Commit b738ee189f70063ed66f3375e8a5ade3f721d6a6

Nick Mathewson 2012-11-01T10:19:01

Merge remote-tracking branch 'rosslagerwall/python2'