From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 4 Feb 2013 17:34:14 +0000 (-0500)
Subject: Merge branch 'authdir_quick_fix'
X-Git-Tag: tor-0.2.4.10-alpha~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12f2d986f327de281cb70377a7cf926b0f40f4e4;p=thirdparty%2Ftor.git

Merge branch 'authdir_quick_fix'
---

12f2d986f327de281cb70377a7cf926b0f40f4e4