commit c2aa2db8b5f523c62712d3c4944b1a4c4c514b1c Merge: 8f11642 bd67b23 Author: Nick Mathewson <nickm at torproject.org> Date: Sat Jan 15 12:43:02 2011 -0500 Merge branch 'bug2332_part2' into maint-0.2.1