commit abd34f1527272f759d8b45bdf770385c2be2dbe8 Merge: e740ac0 5d30951 Author: Roger Dingledine <arma at torproject.org> Date: Thu Oct 27 20:02:58 2011 -0400 Merge branch 'maint-0.2.1' into release-0.2.1