]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d0b62ff 3b2a732)
Merge branch 'maint-0.4.1'
authorNick Mathewson <nickm@torproject.org>
Tue, 20 Aug 2019 15:15:57 +0000 (11:15 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 20 Aug 2019 15:15:57 +0000 (11:15 -0400)
"ours" to avoid 0.4.1 bump.


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