Merge remote branch 'sebastian/bug925'
commita4065cd832dcbbe034dac1f42db7bdd315a7d734
authorNick Mathewson <nickm@torproject.org>
Tue, 9 Feb 2010 17:50:54 +0000 (9 12:50 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 9 Feb 2010 17:50:54 +0000 (9 12:50 -0500)
tree159014b56431cb76a46229960d78c797ab99fd36
parent6dd71d314dfe361aab52628e54f3aa9666c115e4
parentb2b99a70c005ae4158786d0c30b35dc6db45e9b6
Merge remote branch 'sebastian/bug925'