From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 19 Feb 2015 16:35:32 +0000 (-0500)
Subject: Merge branch 'AUTHDIR_NEWDESC_enough_squashed'
X-Git-Tag: tor-0.2.6.3-alpha~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a17470a6232ce7170c66ff8a1ce75c6081154fb3;p=thirdparty%2Ftor.git

Merge branch 'AUTHDIR_NEWDESC_enough_squashed'
---

a17470a6232ce7170c66ff8a1ce75c6081154fb3