Merge branch 'bug5786'
commit0b1a334842f632b935d0b23757722d06bd145724
authorNick Mathewson <nickm@torproject.org>
Thu, 10 May 2012 19:44:41 +0000 (10 15:44 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 10 May 2012 19:44:41 +0000 (10 15:44 -0400)
tree2182965c5ff652c8289df03d438c8f69c5322320
parentc78a42685fd342ec961ede7a61e7b82bd40060b8
parentd9ba9f91d25210f10f740d243899dbe99f8acb60
Merge branch 'bug5786'