Merge branch 'maint-0.2.3' into release-0.2.3
commitb26d59d7158c2a1883dfeba26eff820f37660ced
authorRoger Dingledine <arma@torproject.org>
Fri, 6 Jul 2012 20:32:32 +0000 (6 16:32 -0400)
committerRoger Dingledine <arma@torproject.org>
Fri, 6 Jul 2012 20:32:32 +0000 (6 16:32 -0400)
tree69999c81227cf888da2e9e531d3278cedb5650f4
parentb5e9c86233ec66465e2b4c09590f3178597e6c37
parent5ddb9b3134b30da0c4ae8857bc15ddaa7c29a4b1
Merge branch 'maint-0.2.3' into release-0.2.3