From: teor <teor@torproject.org>
Date: Fri, 3 Apr 2020 11:59:19 +0000 (+1000)
Subject: Merge remote-tracking branch 'tor-github/pr/1739'
X-Git-Tag: tor-0.4.5.0-alpha-dev~84
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0efcdb8918681763799b871b53785d77edbbf088;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'tor-github/pr/1739'

Ignored conflicting style changes: they will be re-applied in
the next commit.
---

0efcdb8918681763799b871b53785d77edbbf088