Merge branch 'maint-0.2.4' into release-0.2.4
commit911fb9399fdd88a51222779268ffc55ab12a18ac
authorRoger Dingledine <arma@torproject.org>
Thu, 24 Jul 2014 20:22:36 +0000 (24 16:22 -0400)
committerRoger Dingledine <arma@torproject.org>
Thu, 24 Jul 2014 20:22:36 +0000 (24 16:22 -0400)
treefec90ae7c7595cfe1d51e12e9347a43d3146f66b
parentdd4f5bc8a778502a769d3e32d0f238f74e6af845
parent71c62b15ca809105cbba0bf2fa86484793701b64
Merge branch 'maint-0.2.4' into release-0.2.4