commit 215c3eef81466415d40f5224ed02db4ca7d1b454
Merge: 40797bd36 9dd908e71
Author: teor <[email protected]>
Date: Thu Sep 5 12:05:56 2019 +1000
Merge branch 'maint-0.4.1' into release-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.
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
