From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 4 Jun 2019 12:29:05 +0000 (-0400)
Subject: Merge branch 'bug29670_035' into bug29670_041
X-Git-Tag: tor-0.4.1.2-alpha~17^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4022b6d6b7a2b5e1260c4bccbad119e8461c0b84;p=thirdparty%2Ftor.git

Merge branch 'bug29670_035' into bug29670_041
---

4022b6d6b7a2b5e1260c4bccbad119e8461c0b84