commit bbf782dc13915c579396d94efbdf87b5c32b70d3 Merge: 3d4c2ff 06deec1 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Feb 22 17:21:34 2011 -0500 Merge remote branch 'origin/maint-0.2.2'