Merge branch 'maint-0.2.4' into release-0.2.4
commit34c70ba9e62cc28c3bfe363c1c34a2f0fbf2dba4
authorRoger Dingledine <arma@torproject.org>
Sat, 8 Jun 2013 19:12:29 +0000 (8 15:12 -0400)
committerRoger Dingledine <arma@torproject.org>
Sat, 8 Jun 2013 19:12:29 +0000 (8 15:12 -0400)
tree263e5e03d93e4a03562659685a7a30986e3a8920
parent2d4aebaf762f022a46932c9f56cbe8802d99c3da
parentc860a96ecb652d76dc23f2b490db4f5a95e9b0c3
Merge branch 'maint-0.2.4' into release-0.2.4