commit 425e4236c6c3af653565763cfa9e921aa73cf9e0 Merge: 47dff61 9c2ca5b Author: Roger Dingledine <arma at torproject.org> Date: Thu Oct 27 20:04:51 2011 -0400 Merge branch 'maint-0.2.2'