Merge branch 'maint-0.2.4'
commitf2e7271dcad8a8a79fddd253e602c64297e691ad
authorRoger Dingledine <arma@torproject.org>
Thu, 11 Apr 2013 14:40:06 +0000 (11 10:40 -0400)
committerRoger Dingledine <arma@torproject.org>
Thu, 11 Apr 2013 14:40:06 +0000 (11 10:40 -0400)
tree80878ae09346514aaa0841dd3b3a36cacbe91ad3
parent7ed1af36716f21b19cb7895f1a8c2203990bb49f
parentd028c005da8e61f705aff751b5236adf983b310a
Merge branch 'maint-0.2.4'