commit 4082d67b03075712707d76b960c6525d00c1c0c0 Merge: 98994e2 2e85c3a Author: Nick Mathewson <nickm at torproject.org> Date: Mon May 16 16:44:19 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2'