From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 23 May 2016 14:45:13 +0000 (-0400)
Subject: Merge remote-tracking branch 'dgoulet/bug19066_029_01'
X-Git-Tag: tor-0.2.9.1-alpha~217
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2a884926c04959b11c39e656099f19a55c3a8e95;p=thirdparty%2Ftor.git

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

2a884926c04959b11c39e656099f19a55c3a8e95