From: teor <teor@torproject.org>
Date: Thu, 5 Sep 2019 01:42:26 +0000 (+1000)
Subject: Merge commit '763fd0ad66' into maint-0.4.0
X-Git-Tag: tor-0.4.0.6~25^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1203e137be4303bce42e46bd41eb78bf79f691d7;p=thirdparty%2Ftor.git

Merge commit '763fd0ad66' into maint-0.4.0

tor-github/pr/1174, but with the last commit re-worded to remove
the fixup, because fixups break our push rules.
---

1203e137be4303bce42e46bd41eb78bf79f691d7