commit 189ba4c9a90a691c709f05540166247d0237ffc2 Merge: 4a3ef00 0d94f78 Author: Nick Mathewson <nickm at torproject.org> Date: Mon May 16 16:42:05 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.1' into release-0.2.1