From: teor <teor@torproject.org>
Date: Sun, 15 Dec 2019 23:14:38 +0000 (+1000)
Subject: Merge branch 'bug32240_040' into bug32240_041
X-Git-Tag: tor-0.4.2.6~12^2~2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4a34fd5b746fcbd712607323cb48cfcd6e72456f;p=thirdparty%2Ftor.git

Merge branch 'bug32240_040' into bug32240_041
---

4a34fd5b746fcbd712607323cb48cfcd6e72456f