commit 730dce46af87884d3b5d6443ac4013f51483ca8c Merge: af85017 98870f2 Author: Nick Mathewson <nickm at torproject.org> Date: Thu May 12 19:27:25 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2'