Merge branch 'maint-0.2.4' into release-0.2.4
commite9f0cdf55fe22a83e5bffd51189fc2e5752669e7
authorRoger Dingledine <arma@torproject.org>
Mon, 1 Jul 2013 19:08:57 +0000 (1 15:08 -0400)
committerRoger Dingledine <arma@torproject.org>
Mon, 1 Jul 2013 19:08:57 +0000 (1 15:08 -0400)
treec40fb7095341bb01e9e8c8833ef520e01f2b7215
parent7b298388911d863ad34ff3327de3e55891ac7b50
parent81a5ee77ec6df66ca9a5044bdf127b11922e0dd9
Merge branch 'maint-0.2.4' into release-0.2.4