]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0fe9657 648d5df)
Merge branch 'maint-0.4.1'
authorNick Mathewson <nickm@torproject.org>
Wed, 26 Jun 2019 13:50:12 +0000 (09:50 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 26 Jun 2019 13:50:12 +0000 (09:50 -0400)
"ours" to avoid the 0.4.1 version of #30871.


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