Commit 2479d964054c3743b9ed292dc1cd2ee70aadf6fb

Nick Mathewson 2012-10-26T19:36:44

Merge remote-tracking branch 'rosslagerwall/python2-2.0' into patches-2.0