Merge branch 'maint-0.2.4' into release-0.2.4
commit5d1a004e0dd0ef33f60985c47f86c255a3404a0f
authorRoger Dingledine <arma@torproject.org>
Fri, 15 Nov 2013 22:10:31 +0000 (15 17:10 -0500)
committerRoger Dingledine <arma@torproject.org>
Fri, 15 Nov 2013 22:10:31 +0000 (15 17:10 -0500)
treefe4c6e583b19670a69e5b3ea8ae213b802957182
parentf503f3043673e6eb550c722b74e57b49d4443ae7
parent59f50c80d443a7e148f85cfed493e3e703cc4386
Merge branch 'maint-0.2.4' into release-0.2.4