From: Nick Mathewson Date: Thu, 9 Oct 2014 14:55:09 +0000 (-0400) Subject: Merge remote-tracking branch 'teor/bug-13163-AlternateAuthorities-type-handling-fixed' X-Git-Tag: tor-0.2.6.1-alpha~55 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e5f9f287ced36e18241e250d4b63603b9c4f006f;p=thirdparty%2Ftor.git Merge remote-tracking branch 'teor/bug-13163-AlternateAuthorities-type-handling-fixed' --- e5f9f287ced36e18241e250d4b63603b9c4f006f