From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 18 May 2015 15:29:50 +0000 (-0400)
Subject: Merge remote-tracking branch 'dgoulet/bug16021_027_01'
X-Git-Tag: tor-0.2.7.2-alpha~153
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cc1943bf6e567224cea834e7fac3967582074c3e;p=thirdparty%2Ftor.git

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

cc1943bf6e567224cea834e7fac3967582074c3e