Merge branch 'maint-0.2.4' into release-0.2.4
commit6837a270250a52ee1189cb17f00e29cfa3070e73
authorRoger Dingledine <arma@torproject.org>
Mon, 11 Nov 2013 02:51:31 +0000 (10 21:51 -0500)
committerRoger Dingledine <arma@torproject.org>
Mon, 11 Nov 2013 02:51:31 +0000 (10 21:51 -0500)
treeede8888324edb42410fdf7f48e21f704d985abc1
parent33b86071b765b6254f5aab13fc6dceebe206b103
parent8bfa596c152603e376b8f096a3367c1d785d6763
Merge branch 'maint-0.2.4' into release-0.2.4