]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1d6114 9dd908e)
Merge branch 'maint-0.4.1'
authorteor <teor@torproject.org>
Thu, 5 Sep 2019 02:08:02 +0000 (12:08 +1000)
committerteor <teor@torproject.org>
Thu, 5 Sep 2019 02:08:02 +0000 (12:08 +1000)
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.


Trivial merge
Mirror of https://git.torproject.org/tor.git