commit 3ae4df5cd7d26d4f090f8a35819a0ad1b29569e7 Merge: f550c96 6def568 Author: Nick Mathewson <nickm at torproject.org> Date: Sat Jan 15 12:49:22 2011 -0500 Merge remote branch 'origin/maint-0.2.2'