]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: be88f12 c9906cc)
Merge branch 'maint-0.3.5'
authorNick Mathewson <nickm@torproject.org>
Fri, 16 Nov 2018 13:28:59 +0000 (08:28 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 16 Nov 2018 13:29:05 +0000 (08:29 -0500)
"ours" to avoid version bump.


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