[tor-commits] [tor/release-0.2.2] Merge branch 'maint-0.2.1' into maint-0.2.2

commit ac7b6c508dca24a256abc30b4ecaf21019569a38 Merge: 4a351b4 679f617 Author: Roger Dingledine <arma@torproject.org> Date: Thu Sep 15 16:34:47 2011 -0400 Merge branch 'maint-0.2.1' into maint-0.2.2