commit b6e37303587db1ca2b31c2f96e8a0a6df389b410 Merge: c4eae75 9c2ca5b Author: Roger Dingledine <arma at torproject.org> Date: Thu Oct 27 20:04:38 2011 -0400 Merge branch 'maint-0.2.2' into release-0.2.2