From: teor <teor@torproject.org>
Date: Thu, 5 Sep 2019 02:08:02 +0000 (+1000)
Subject: Merge branch 'maint-0.4.1'
X-Git-Tag: tor-0.4.2.1-alpha~40
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ff6ebc6fc3b3beb98b7b75ecb05d9b55ef3cefc;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.1'

Resolved modified/deleted conflict on changes/bug30649 by deleting
the file.

tor-github/pr/1282 modifies ChangeLog and ReleaseNotes instead of
changes/bug30649. We cherry-picked it to master, as well as merging
to release-0.4.1.
---

2ff6ebc6fc3b3beb98b7b75ecb05d9b55ef3cefc