Merge commit 'karsten/rendspec-master'
commit7409929917a63b04a29e20cce054cf7bb7be4996
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)
tree1bff317e66a959d21f0d3ffa2b8e569771f18037
parent86a3b650b8a095cddd77f56ccdaa2b8378660d95
parent1cf6da821c3aa27e8d81c674b9c1c63d951dd0cc
Merge commit 'karsten/rendspec-master'