From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 3 Aug 2010 13:14:38 +0000 (-0400)
Subject: Merge commit 'karsten/dir-spec-fix'
X-Git-Tag: tor-0.2.2.15-alpha~51
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ba24acbf1fc244844c5990d7b4e987d704941936;p=thirdparty%2Ftor.git

Merge commit 'karsten/dir-spec-fix'
---

ba24acbf1fc244844c5990d7b4e987d704941936