Merge branch 'maint-0.2.4' into release-0.2.4
commit2d4aebaf762f022a46932c9f56cbe8802d99c3da
authorRoger Dingledine <arma@torproject.org>
Sat, 25 May 2013 03:58:16 +0000 (24 23:58 -0400)
committerRoger Dingledine <arma@torproject.org>
Sat, 25 May 2013 03:58:16 +0000 (24 23:58 -0400)
tree24427f0d14aed6091c08013db129bc6d5f0d9fb2
parent91b8bc26f160f172e2d358d20fc8a3bc150e092d
parent30c06c187a0b649bd2d30edc0b16e2376f74ad9a
Merge branch 'maint-0.2.4' into release-0.2.4