Merge branch 'maint-0.2.4' into release-0.2.4
commitb9d11bd87c292ef4a7bb785ef305a59afab37865
authorRoger Dingledine <arma@torproject.org>
Fri, 11 Oct 2013 01:42:33 +0000 (10 21:42 -0400)
committerRoger Dingledine <arma@torproject.org>
Fri, 11 Oct 2013 01:42:33 +0000 (10 21:42 -0400)
tree3d866dd70ad765e246b86b95f2d9f4346c8a81c8
parent63bef6c6abd35dc0744eb9b9ac814d7b8fd1dd21
parenteb5d75e96afed76b968cb87365ba6e54cac35b2e
Merge branch 'maint-0.2.4' into release-0.2.4
ChangeLog