commit f2e7271dcad8a8a79fddd253e602c64297e691ad Merge: 7ed1af3 d028c00 Author: Roger Dingledine <arma at torproject.org> Date: Thu Apr 11 10:40:06 2013 -0400 Merge branch 'maint-0.2.4'