commit 2ff6ebc6fc3b3beb98b7b75ecb05d9b55ef3cefc Merge: c1d61141f 9dd908e71 Author: teor <teor@torproject.org> Date: Thu Sep 5 12:08:02 2019 +1000 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.