From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 11 Feb 2015 20:59:41 +0000 (-0500)
Subject: Merge branch 'bug14478_squashed'
X-Git-Tag: tor-0.2.6.3-alpha~56
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f794a091647050efa97719581f99c453b38074dd;p=thirdparty%2Ftor.git

Merge branch 'bug14478_squashed'
---

f794a091647050efa97719581f99c453b38074dd