commit 89ae844094313aba553ee8e8b9c9ebd89585488b Merge: c0fae84 952ae0e Author: Nick Mathewson <nickm at torproject.org> Date: Mon May 16 16:42:17 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into release-0.2.2