Merge commit 'karsten/rendspec-master'
commit5f75ac29abe79e8bc1635e761df76cbdc6774c60
authorNick Mathewson <nickm@torproject.org>
Fri, 30 Jul 2010 15:45:22 +0000 (30 11:45 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 30 Jul 2010 15:45:22 +0000 (30 11:45 -0400)
tree5ccbbc771433ac0f45060ad8a6aca59fab54b008
parent8c6859501ba7c7ff26bd0e16c45bee62542e6b8e
parentc1b82a66657358e44238357889a33236274b8853
Merge commit 'karsten/rendspec-master'