From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 2 Sep 2015 20:00:07 +0000 (-0400)
Subject: Merge remote-tracking branch 'dgoulet/bug15963_026_01'
X-Git-Tag: tor-0.2.7.3-rc~58
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb71777bb28b353da68c0ea25a36d0ac763de550;p=thirdparty%2Ftor.git

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

eb71777bb28b353da68c0ea25a36d0ac763de550