]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7b6ed1 f229c4e)
Merge branch 'maint-0.3.5'
authorNick Mathewson <nickm@torproject.org>
Wed, 7 Nov 2018 19:40:34 +0000 (14:40 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 7 Nov 2018 19:40:34 +0000 (14:40 -0500)
"ours" to avoid version bump.


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