From: teor <teor@torproject.org>
Date: Fri, 5 Apr 2019 02:58:32 +0000 (+1000)
Subject: Merge branch 'bug29036-29962-034' into bug29036-29962-035
X-Git-Tag: tor-0.4.0.4-rc~14^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=db71bceb4048c0274001ee46ebab2c60f8d11259;p=thirdparty%2Ftor.git

Merge branch 'bug29036-29962-034' into bug29036-29962-035
---

db71bceb4048c0274001ee46ebab2c60f8d11259