From: teor <teor@torproject.org>
Date: Wed, 17 Apr 2019 01:51:32 +0000 (+1000)
Subject: Merge branch 'bug30184_029' into bug30184_034
X-Git-Tag: tor-0.3.5.9~29^2~6^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dfdd877647ef496b2b4a82e8c1e6040692ecebb5;p=thirdparty%2Ftor.git

Merge branch 'bug30184_029' into bug30184_034

"ours" merge, because 0.3.4 has a different set of changes,
which already compile.
---

dfdd877647ef496b2b4a82e8c1e6040692ecebb5