Merge branch 'bug1810' into maint-0.2.2
commit0235fe34d2c915f46933ead253192b042c713af0
authorRoger Dingledine <arma@torproject.org>
Sat, 21 May 2011 20:09:55 +0000 (21 16:09 -0400)
committerRoger Dingledine <arma@torproject.org>
Sat, 21 May 2011 20:09:55 +0000 (21 16:09 -0400)
tree49eac222284c1587bf8d7dbb540002f8ed0b97d1
parenta2851d303414bbbdff97a02d142275c3e7c71841
parent3ff7925a7027b81cb9f14b0863972b4d4e5b46a4
Merge branch 'bug1810' into maint-0.2.2