commit b7b01d963af19497df2d23fd558ff408a12a669b Merge: 10d385b b27f5cc Author: Nick Mathewson <nickm at torproject.org> Date: Sat Jan 15 10:26:44 2011 -0500 Merge remote branch 'origin/maint-0.2.2'