]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2fca2ed 2b54733)
Merge branch 'maint-0.4.0'
authorNick Mathewson <nickm@torproject.org>
Thu, 2 May 2019 18:33:09 +0000 (14:33 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 2 May 2019 18:33:09 +0000 (14:33 -0400)
"ours" to avoid version bump.


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