From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 30 Jul 2010 15:45:22 +0000 (-0400)
Subject: Merge commit 'karsten/rendspec-master'
X-Git-Tag: tor-0.2.2.15-alpha~61
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7409929917a63b04a29e20cce054cf7bb7be4996;p=thirdparty%2Ftor.git

Merge commit 'karsten/rendspec-master'
---

7409929917a63b04a29e20cce054cf7bb7be4996