commit f85c56182f485bea483288a26fd74cefcb87653a Merge: 41d9d3f a166f10 Author: Roger Dingledine <arma at torproject.org> Date: Wed Oct 26 17:14:39 2011 -0400 Merge branch 'maint-0.2.1' into maint-0.2.2