commit 92e607d951c87bdc3e35d9bf3cfedcd0c39e9ae8 Merge: dc0bb6b 78d5955 Author: Nick Mathewson <nickm at torproject.org> Date: Wed Mar 9 16:22:50 2011 -0500 Merge remote branch 'origin/maint-0.2.2'