Merge branch 'maint-0.2.4' into release-0.2.4
commit7067f53d424820566c41412c637177b823a52c10
authorRoger Dingledine <arma@torproject.org>
Wed, 16 Oct 2013 22:51:15 +0000 (16 18:51 -0400)
committerRoger Dingledine <arma@torproject.org>
Wed, 16 Oct 2013 22:51:15 +0000 (16 18:51 -0400)
treebda60aa5fb6b16a98ef88c9c676a62aa30a2ccbb
parentfd35354441223b33cda760c4e5604c3a762c7255
parent8f9fb63cdb188e27e39cf063c6a9e94df66cf239
Merge branch 'maint-0.2.4' into release-0.2.4