Merge commit 'sebastian/rend-spec'
commit05fa0a3ef657c9309a51a1d7b4e78b2764f110f6
authorNick Mathewson <nickm@torproject.org>
Tue, 3 Aug 2010 13:16:24 +0000 (3 09:16 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 3 Aug 2010 13:16:24 +0000 (3 09:16 -0400)
treec6c304aa990f575622b35ee5c8b32d3f05e8c23c
parentba24acbf1fc244844c5990d7b4e987d704941936
parent8557f64220d0f9e50d573e1aa4bf103b7ba7fb4f
Merge commit 'sebastian/rend-spec'