commit 07a5fd10544be1ce382e02824617685d960ab3b7 Merge: 2f3dad1 5a02406 Author: Nick Mathewson <nickm at torproject.org> Date: Wed Nov 16 16:23:24 2011 -0500 Merge remote-tracking branch 'origin/maint-0.2.2'