commit 9c2ca5b52f0d8eb504cff0e80ac6366e87224ead Merge: 4684ced 5d30951 Author: Roger Dingledine <arma at torproject.org> Date: Thu Oct 27 20:03:21 2011 -0400 Merge branch 'maint-0.2.1' into maint-0.2.2