Merge branch 'maint-0.2.4' into release-0.2.4
commit5ba8ab5a88b36c05986fee1535d4615024974e6d
authorNick Mathewson <nickm@torproject.org>
Mon, 9 Mar 2015 20:24:20 +0000 (9 16:24 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 9 Mar 2015 20:24:20 +0000 (9 16:24 -0400)
tree786f325be7b3f3c4e220befde71922ee3bfd55b3
parentef5f2b3606357fc56da3c669d2fe86a8c1acaeab
parent220e9be0959241ce5ea36f64bc08245292a6b06c
Merge branch 'maint-0.2.4' into release-0.2.4