Merge commit 'sebastian/bug2663' into maint-0.2.2
commit600ad7bf8d499d04259586bcf91afed7dfb88f99
authorRoger Dingledine <arma@torproject.org>
Sat, 12 Mar 2011 01:37:21 +0000 (11 20:37 -0500)
committerRoger Dingledine <arma@torproject.org>
Sat, 12 Mar 2011 01:37:21 +0000 (11 20:37 -0500)
tree9fe6247b2611bf9dff6292fa6079cb299ab6cc0d
parent879f1718ad59682387ffc54b9d8589badb5f1e81
parent2f8e96b5535481e157486944c8d7637f31e1a197
Merge commit 'sebastian/bug2663' into maint-0.2.2