commit 9625a2e8f5070198f58b3c343e65a3ac99765ede Merge: c21c8da 41d9d3f Author: Roger Dingledine <arma at torproject.org> Date: Wed Oct 26 16:36:59 2011 -0400 Merge branch 'maint-0.2.2'