Merge branch 'maint-0.2.4' into release-0.2.4
commit4a1d9726f4d6e212ec2f0e1ac90a3f09ca27c853
authorRoger Dingledine <arma@torproject.org>
Sun, 28 Jul 2013 13:50:19 +0000 (28 09:50 -0400)
committerRoger Dingledine <arma@torproject.org>
Sun, 28 Jul 2013 13:50:19 +0000 (28 09:50 -0400)
treeb2a5a8a8acb846420ff033bfebec9a59caef2aa8
parent2b9fb51ac61c75d582008e892773fc1571145d65
parent8d0fb3a4347aa543d2aa27f177446888fbdae125
Merge branch 'maint-0.2.4' into release-0.2.4