Tag release-2.1.1-alpha

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

Browse

Commit 6f2337dd
Author Nick Mathewson
Date 2012-04-03T18:39:30