Merge branch 'bug1653'
commitaa42f941dc58ff7554e31dc6f15e4d23f639f351
authorNick Mathewson <nickm@torproject.org>
Wed, 8 Sep 2010 14:49:24 +0000 (8 10:49 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 8 Sep 2010 14:49:24 +0000 (8 10:49 -0400)
tree820fd82c59c1ab5cdbd01faaaf2a668d96417de4
parent669fd05ed8cf7b90bb9e43dbbbbd35f40bf05fa0
parent296a7d83880d75296d6665295f9fc4cb41cb63d8
Merge branch 'bug1653'