From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 24 Apr 2017 16:42:11 +0000 (-0400)
Subject: Merge remote-tracking branch 'dgoulet/ticket21980_031_01'
X-Git-Tag: tor-0.3.1.1-alpha~149
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4cefda85e42c39a9455c04b6d2f2e10b491b975b;p=thirdparty%2Ftor.git

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

4cefda85e42c39a9455c04b6d2f2e10b491b975b