Merge commit 'sebastian/bug1381'
commitd4fa302646d78b58b1a6086e3f221d237a336c7b
authorNick Mathewson <nickm@torproject.org>
Tue, 1 Jun 2010 14:36:50 +0000 (1 10:36 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 1 Jun 2010 14:36:50 +0000 (1 10:36 -0400)
tree38828414ffe6b3674736328055ed97a8d19fb0b9
parent312f4ee410de718aaf20030d22a93f1c258faa37
parentb3b2a57bbf9da1edbfd7e0a53f53188720e3921e
Merge commit 'sebastian/bug1381'