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

Merge branch 'bug32240_32242_040' into bug32240_32242_041
---

84c4ede052bc642677d9f53f9802e6d69ca647df