Merge branch 'maint-0.2.4' into release-0.2.4
commitd78bb2df0ee9366efc5b25a40684d7ab9451da37
authorRoger Dingledine <arma@torproject.org>
Fri, 14 Jun 2013 08:07:30 +0000 (14 04:07 -0400)
committerRoger Dingledine <arma@torproject.org>
Fri, 14 Jun 2013 08:07:30 +0000 (14 04:07 -0400)
tree5a801efda9842c5688391932e4a434e5f9df9fba
parente86f12226540ea058defc892cc55cfed744c33d8
parent8b6d0bd99cf233560f7e704a35e4f64a5271bfb1
Merge branch 'maint-0.2.4' into release-0.2.4