Merge branch 'maint-0.2.4'
commit78251e004f03eca93dfbdae2a2b6c18bff948bf2
authorRoger Dingledine <arma@torproject.org>
Fri, 11 Oct 2013 01:25:01 +0000 (10 21:25 -0400)
committerRoger Dingledine <arma@torproject.org>
Fri, 11 Oct 2013 01:25:01 +0000 (10 21:25 -0400)
tree8a350277a89fe995ab17e584bef15e6972b91187
parent43f95e38abefced37ad24966d56298e972cebf81
parenteb5d75e96afed76b968cb87365ba6e54cac35b2e
Merge branch 'maint-0.2.4'
ChangeLog