From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 30 Jan 2015 20:29:59 +0000 (-0500)
Subject: Merge remote-tracking branch 'dgoulet/bug14554_026_v1'
X-Git-Tag: tor-0.2.6.3-alpha~94
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aba90b2125725a2d870a847482e30d78a1a2582d;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'dgoulet/bug14554_026_v1'
---

aba90b2125725a2d870a847482e30d78a1a2582d