]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 847fc32 cafb999)
Merge branch 'maint-0.4.0'
authorNick Mathewson <nickm@torproject.org>
Tue, 30 Apr 2019 19:54:03 +0000 (15:54 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 30 Apr 2019 19:54:03 +0000 (15:54 -0400)
"ours" to avoid version bump


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