Gallopsled/pwntools — pull request #277 by zachriggle (2014-12-30 21:57:23+00:00)
Title: Move Thread underneath the ContextType class

Now pwnlib.context.Thread == pwnlib.context.context.thread == pwnlib.context.context.Thread

I branched at 7f99c63 so you should just be able to `git reset --hard` onto this branch from `import-cleanup`.