Merge commit 'nickm/fix_security_bug_022' into maint-0.2.2
commitc63c937465f91b60f07e70942e2cb5af1b90dce4
authorRoger Dingledine <arma@torproject.org>
Thu, 16 Dec 2010 22:24:11 +0000 (16 17:24 -0500)
committerRoger Dingledine <arma@torproject.org>
Thu, 16 Dec 2010 22:24:11 +0000 (16 17:24 -0500)
tree1b44da39cbe47b5176829100ed8ff038348681fc
parent591f65dde68c7847e4282c4cba5a11868fe13158
parentb5e293afe6b3c98b50c23cc443969b5f840dca32
Merge commit 'nickm/fix_security_bug_022' into maint-0.2.2