From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 3 Aug 2010 13:16:24 +0000 (-0400)
Subject: Merge commit 'sebastian/rend-spec'
X-Git-Tag: tor-0.2.2.15-alpha~50
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=05fa0a3ef657c9309a51a1d7b4e78b2764f110f6;p=thirdparty%2Ftor.git

Merge commit 'sebastian/rend-spec'
---

05fa0a3ef657c9309a51a1d7b4e78b2764f110f6