Merge commit 'nickm/fix_security_bug_021' into maint-0.2.1
commit975ffe439889300783e0607dd20fce550f418ff5
authorRoger Dingledine <arma@torproject.org>
Thu, 16 Dec 2010 21:59:12 +0000 (16 16:59 -0500)
committerRoger Dingledine <arma@torproject.org>
Thu, 16 Dec 2010 21:59:12 +0000 (16 16:59 -0500)
tree52cd8a4410e5d69ecd627b7ad25d2973ba7d3362
parent3c3b1d14fd1031c244c62fd16dac0dff53cb069f
parentb0def605a52b3acce1cb212f270b184d72f237f5
Merge commit 'nickm/fix_security_bug_021' into maint-0.2.1