commit 53d02a63dfee248669c402d3480af7184758cf52 Merge: 13f60e1 de1c36f Author: Nick Mathewson <nickm at torproject.org> Date: Wed Apr 6 16:20:32 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2'