From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 11 Feb 2014 15:15:03 +0000 (-0500)
Subject: Merge remote-tracking branch 'karsten/one-dirauth'
X-Git-Tag: tor-0.2.5.2-alpha~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cb065a55bd209b9c23bc14119c2403680b087885;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'karsten/one-dirauth'
---

cb065a55bd209b9c23bc14119c2403680b087885