commit 03fea3ae91281c8146e5a577e18ef46e81eb6e49 Merge: a518dd6 9af3a3c Author: Roger Dingledine <arma at torproject.org> Date: Wed Oct 26 07:53:49 2011 -0400 Merge branch 'maint-0.2.2'