From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 1 Apr 2015 16:50:36 +0000 (-0400)
Subject: Merge remote-tracking branch 'dgoulet/bug15296_027_01'
X-Git-Tag: tor-0.2.7.1-alpha~95
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=13209eb6f34165eb72ecd4425770cba6af4f5391;p=thirdparty%2Ftor.git

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

13209eb6f34165eb72ecd4425770cba6af4f5391