commit ba91272dedf9bacd7e7ef176c8a549f3aa5da452 Merge: 6258013 48bafb4 Author: Roger Dingledine <arma at torproject.org> Date: Thu Oct 27 20:53:17 2011 -0400 Merge branch 'maint-0.2.2'