Merge branch 'maint-0.2.4' into release-0.2.4
commit8fd9644f172a03f87a67cbfb69110bff2353f95b
authorRoger Dingledine <arma@torproject.org>
Mon, 30 Sep 2013 04:46:57 +0000 (30 00:46 -0400)
committerRoger Dingledine <arma@torproject.org>
Mon, 30 Sep 2013 04:46:57 +0000 (30 00:46 -0400)
tree0e735e4c76f8dae08682e90e2d83d422a9de36ce
parent00fb525b23cf070fb229e1073caae47e6401f1e2
parent938ee9b24dfda03a68a71d43b88e9fb00a90f9c8
Merge branch 'maint-0.2.4' into release-0.2.4