Commit 01a6ef78b97e85fea4220d9086615261affeedea

Nick Mathewson 2013-07-21T13:27:49

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